Merge 0.9.0

Author: robotconscience

README.md

@@ -123,6 +123,7 @@
 ofxLibwebsockets uses [libwebsockets 1.3](http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tag/?id=v1.3-chrome37-firefox30)
 
 ### OS X
+
 * Clone libwebsockets
 ``` 
 cd /path/to/libwebsockets
@@ -132,7 +133,9 @@ cmake "-DCMAKE_OSX_ARCHITECTURES=x86_64;i386" ..
 make
 cmake -DCMAKE_INSTALL_PREFIX:PATH=./install . && make install
 ``` 
+
 ### Raspberry Pi
+
 * Clone libwebsockets
 ``` 
 cd /path/to/libwebsockets
@@ -141,7 +144,9 @@ cd build
 cmake .. -DLWS_IPV6=OFF
 make
 ``` 
+
 ### Linux
+
 * Clone libwebsockets
 ``` 
 cd /path/to/libwebsockets
@@ -151,7 +156,9 @@ cmake ..
 make
 cp lib/libwebsockets.a /path/to/ofxLibwebsocket/libs/libwebsockets/lib/linux64/
 ```  
+
 ### iOS
+
 * Clone libwebsockets
 * Clone this repo; it contains compiling resources in ofxLibwebsockets/extras/ios_libwebsockets
 	* The toolchain in this folder will allow you to create an iOS XCode project
@@ -174,3 +181,25 @@ cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/ofxLibwebsockets/extras/ios_libwebsockets/
 cd /path/to/your/build/folder
 cp lib/Relase/libwebsockets.a /PATH/TO/OF/addons/ofxLibwebsockets/libs/libwebsockets/lib/iosarmv7/libwebsockets.a
 ```
+
+### Windows (Visual Studio, x64)
+
+* Install OpenSSL
+  *  Binaries are available from [Shining Light Productions] (https://slproweb.com/products/Win32OpenSSL.html)
+  * If that site is no longer around, try the [OpenSSL Community page](https://www.openssl.org/community/binaries.html)
+  * Install [Win64 OpenSSL v1.0.2d](https://slproweb.com/download/Win64OpenSSL-1_0_2d.exe) (Full version, not Light)
+  * Use the default location so CMake can find it easily: `C:\OpenSSL-Win64`
+
+* Build libwebsockets
+  * libwebsockets' [Build Instructions](https://github.com/warmcat/libwebsockets/blob/master/README.build.md), for reference 
+  * Download [libwebsockets v1.3](https://github.com/warmcat/libwebsockets/releases/tag/v1.3-chrome37-firefox30)
+  * Open the CMake GUI, `cmake-gui.exe`
+  * Create a `build` folder inside the libwebsockets source folder
+  * Set paths in CMake GUI to your source & build folders
+  * Click Configure
+  * Select `Visual Studio 14 2015 Win64` from dropdown, and leave default setting of `Use default native compilers`
+  * Click Finish
+  * Click Generate
+  * Open `build\libwebsockets.sln` from your source folder
+  * Compile the `ALL_BUILD` project in Debug and Release modes
+  * Copy `websockets_static.lib` and `ZLIB.lib` from `build\lib\[Debug|Release\]` into the proper locations in ofxLibwebsockets. You don't need `websockets.lib` or `websockets.exp`

addon_config.mk

@@ -84,15 +84,24 @@ vs:
 	# include search paths, this will be usually parsed from the file system
 	# but if the addon or addon libraries need special search paths they can be
 	# specified here separated by spaces or one per line using +=
-	ADDON_INCLUDES += libs/libwebsockets/include/win32port
-	ADDON_INCLUDES += libs/libwebsockets/include/win32port/win32helpers
-
 
 	# when parsing the file system looking for include paths exclude this for all or
 	# a specific platform
 	ADDON_INCLUDES_EXCLUDE
-	ADDON_LIBS = libs/libwebsockets/lib/win32/Release/websockets.lib
-	ADDON_LIBS += libs/libwebsockets/lib/win32/Release/zlib_internal.lib
+	
+	# Win32/Debug
+	# ADDON_LIBS  = libs/libwebsockets/lib/vs/Win32/Debug/websockets.lib
+	# ADDON_LIBS += libs/libwebsockets/lib/vs/Win32/Debug/zlib_internal.lib
+	# Win32/Release
+	# ADDON_LIBS  = libs/libwebsockets/lib/vs/Win32/Release/websockets.lib
+	# ADDON_LIBS += libs/libwebsockets/lib/vs/Win32/Release/zlib_internal.lib
+	# x64/Debug 
+	# ADDON_LIBS  = libs/libwebsockets/lib/vs/x64/Debug/websockets_static.lib
+	# ADDON_LIBS += libs/libwebsockets/lib/vs/x64/Debug/ZLIB.lib
+	# x64/Release 
+	# ADDON_LIBS  = libs/libwebsockets/lib/vs/x64/Release/websockets_static.lib
+	# ADDON_LIBS += libs/libwebsockets/lib/vs/x64/Release/ZLIB.lib
+
 
 linuxarmv6l:
 	ADDON_LDFLAGS = -lssl

example_client_blob/Project.xcconfig

@@ -13,5 +13,5 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
 //IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
 //ICON_FILE_PATH = bin/data/
 
-OTHER_LDFLAGS = $(OF_CORE_LIBS) 
+OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
 HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)

example_client_blob/example_client_blob.sln

@@ -1,25 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_client_blob", "example_client_blob.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_client_blob", "example_client_blob.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal