Merge branch 'theworkers-feature-raspberry-libs' into 0.8.4

Author: robotconscience

README.md

@@ -117,16 +117,28 @@
 ## Building libwebockets
 ### OS X
 * Clone libwebsockets
-``` Cd /path/to/libwebsockets
-	mkdir build
-	cd build
-	cmake "-DCMAKE_OSX_ARCHITECTURES=x86_64;i386" ..
-	make
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=./install . && make install``` 
-
+``` 
+cd /path/to/libwebsockets
+mkdir build
+cd build
+cmake "-DCMAKE_OSX_ARCHITECTURES=x86_64;i386" ..
+make
+cmake -DCMAKE_INSTALL_PREFIX:PATH=./install . && make install
+``` 
+### Raspberry Pi
+* Clone libwebsockets
+``` 
+cd /path/to/libwebsockets
+mkdir build
+cd build
+cmake .. -DLWS_IPV6=OFF
+make
+```  
 
 #STATUS
-* Version 0.8.1 (current)
+* Version 0.8.4 (current)
+	* Added PRi libraries
+* Version 0.8.1 
 	* Overhauled all messaging, supporting senging/receiving string and binary messages of indefinite size via continuation frames
 	* Added examples from @zebradog of sending Blob data over websockets: way faster, way cleaner!
 	* Lots of cleanup of excessive logging, possible crashes on sending

addon_config.mk

@@ -41,20 +41,20 @@ common:
 	# in the src folders in libs and the root of the addon. if your addon needs
 	# to include files in different places or a different set of files per platform
 	# they can be specified here
-	ADDON_SOURCES = libs/jsoncpp/jsoncpp.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/ofxLibwebsockets.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Server.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Server.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Reactor.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Reactor.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Protocol.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Protocol.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Events.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Events.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Connection.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Connection.cpp
-	ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Client.h
-	ADDON_SOURCES += libs/ofxLibwebsockets/src/Client.cpp
+	# ADDON_SOURCES = libs/jsoncpp/jsoncpp.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/ofxLibwebsockets.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Server.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Server.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Reactor.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Reactor.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Protocol.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Protocol.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Events.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Events.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Connection.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Connection.cpp
+	# ADDON_SOURCES += libs/ofxLibwebsockets/include/ofxLibwebsockets/Client.h
+	# ADDON_SOURCES += libs/ofxLibwebsockets/src/Client.cpp
 
 	# some addons need resources to be copied to the bin/data folder of the project
 	# specify here any files that need to be copied, you can use wildcards like * and ?
@@ -97,7 +97,7 @@ vs:
 
 linuxarmv6l:
 	ADDON_LDFLAGS = -lssl
-	
+	ADDON_SOURCES_EXCLUDE = libs/libwebsockets/include/win32port/%
 	ADDON_LIBS = libs/libwebsockets/lib/linuxarmv6l/libwebsockets.a
 linuxarmv7l:
 	#nothing yet

example_client_hello_world/src/main.cpp

@@ -4,10 +4,13 @@
 
 //========================================================================
 int main( ){
-
+#ifndef TARGET_LINUX_ARM
     ofAppGlutWindow window;
 	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
-
+#else
+	ofSetupOpenGL(1024,768, OF_WINDOW);
+#endif
+        
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too: