Merge branch 'master' into 0.9.0

Author: robotconscience

README.md

@@ -68,7 +68,7 @@
 			* Click the drop down next to "Preprocessor Definitions" and select <Edit>
 			* In the text box that pops up, paste
 			```
-			_WIN32_WINNT=0x500
+			_WIN32_WINNT=0x501
 			```
 	* Adding to new/existing project: 
 		1. Add the ofxLibwebsockets source files to the C++ Linker
@@ -112,7 +112,7 @@
 			* Click the drop down next to "Preprocessor Definitions" and select *Edit*
 			* In the text box that pops up, paste
 			```
-			_WIN32_WINNT=0x500
+			_WIN32_WINNT=0x501
 			```
 			
 * Linux

addon_config.mk

@@ -91,8 +91,8 @@ vs:
 	# 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_static.lib
-	ADDON_LIBS += libs/libwebsockets/lib/win32/Release/ZLIB.lib
+	ADDON_LIBS = libs/libwebsockets/lib/win32/Release/websockets.lib
+	ADDON_LIBS += libs/libwebsockets/lib/win32/Release/zlib_internal.lib
 
 linuxarmv6l:
 	ADDON_LDFLAGS = -lssl

check_compile_osx.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for d in example_*/ ; do
+echo "$d"
+cd $d
+xcodebuild
+done

example_client_blob/example_client_blob.vcxproj

@@ -54,7 +54,7 @@
 			<Optimization>Disabled</Optimization>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-			<PreprocessorDefinitions>_WIN32_WINNT=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_WIN32_WINNT=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 			<WarningLevel>Level3</WarningLevel>
 			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -65,14 +65,14 @@
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Console</SubSystem>
 			<RandomizedBaseAddress>false</RandomizedBaseAddress>
-			<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
+			<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\win32</AdditionalLibraryDirectories>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
 			<WholeProgramOptimization>false</WholeProgramOptimization>
-			<PreprocessorDefinitions>_WIN32_WINNT=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>_WIN32_WINNT=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 			<WarningLevel>Level3</WarningLevel>
 			<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxTurboJpeg\src\;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\include</AdditionalIncludeDirectories>
@@ -85,7 +85,7 @@
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
 			<RandomizedBaseAddress>false</RandomizedBaseAddress>
-			<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
+			<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\win32</AdditionalLibraryDirectories>
 		</Link>
 	</ItemDefinitionGroup>