Merge branch '0.9.2'

Author: robotconscience

example_client_blob/example_client_blob.vcxproj

@@ -102,7 +102,7 @@
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Console</SubSystem>
 			<RandomizedBaseAddress>false</RandomizedBaseAddress>
-			<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
+			<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;websockets_static.lib;ZLIB.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\Win32\Debug;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\Win32\Debug</AdditionalLibraryDirectories>
 		</Link>
 		<PostBuildEvent />
@@ -122,7 +122,7 @@
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<SubSystem>Console</SubSystem>
 			<RandomizedBaseAddress>false</RandomizedBaseAddress>
-			<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
+			<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;websockets_static.lib;ZLIB.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\x64\Debug;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\x64\Debug</AdditionalLibraryDirectories>
 		</Link>
 		<PostBuildEvent />
@@ -144,7 +144,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;websockets_static.lib;ZLIB.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\Win32\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\Win32\Release</AdditionalLibraryDirectories>
 		</Link>
 		<PostBuildEvent />
@@ -165,28 +165,26 @@
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
 			<RandomizedBaseAddress>false</RandomizedBaseAddress>
-			<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;turbojpeg-static.lib</AdditionalDependencies>
+			<AdditionalDependencies>%(AdditionalDependencies);websockets.lib;websockets_static.lib;ZLIB.lib;zlib_internal.lib;turbojpeg-static.lib</AdditionalDependencies>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\vs\x64\Release;..\..\..\addons\ofxTurboJpeg\libs\turbo-jpeg\lib\vs\x64\Release</AdditionalLibraryDirectories>
 		</Link>
 		<PostBuildEvent />
 	</ItemDefinitionGroup>
 	<ItemGroup>
 		<ClCompile Include="src\main.cpp" />
 		<ClCompile Include="src\ofApp.cpp" />
-		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\jsoncpp.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Client.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Connection.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Events.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Protocol.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Reactor.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Server.cpp" />
+		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Util.cpp" />
 		<ClCompile Include="..\..\..\addons\ofxTurboJpeg\src\ofxTurboJpeg.cpp" />
 	</ItemGroup>
 	<ItemGroup>
 		<ClInclude Include="src\ofApp.h" />
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\src\ofxLibwebsockets.h" />
-		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h" />
-		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h" />
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h" />
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\lws_config.h" />
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Client.h" />

example_client_blob/example_client_blob.vcxproj.filters

@@ -7,9 +7,6 @@
 		<ClCompile Include="src\main.cpp">
 			<Filter>src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\jsoncpp.cpp">
-			<Filter>addons\ofxLibwebsockets\libs\jsoncpp</Filter>
-		</ClCompile>
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Client.cpp">
 			<Filter>addons\ofxLibwebsockets\libs\ofxLibwebsockets\src</Filter>
 		</ClCompile>
@@ -28,6 +25,9 @@
 		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Server.cpp">
 			<Filter>addons\ofxLibwebsockets\libs\ofxLibwebsockets\src</Filter>
 		</ClCompile>
+		<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Util.cpp">
+			<Filter>addons\ofxLibwebsockets\libs\ofxLibwebsockets\src</Filter>
+		</ClCompile>
 		<ClCompile Include="..\..\..\addons\ofxTurboJpeg\src\ofxTurboJpeg.cpp">
 			<Filter>addons\ofxTurboJpeg\src</Filter>
 		</ClCompile>
@@ -48,12 +48,6 @@
 		<Filter Include="addons\ofxLibwebsockets\libs">
 			<UniqueIdentifier>{93A2255B-E819-7999-658F-5C8B}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="addons\ofxLibwebsockets\libs\jsoncpp">
-			<UniqueIdentifier>{EDF3DFA8-3A48-F2BE-828A-56B4}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="addons\ofxLibwebsockets\libs\jsoncpp\json">
-			<UniqueIdentifier>{E61DA5C1-FC26-09C7-51F3-45B4}</UniqueIdentifier>
-		</Filter>
 		<Filter Include="addons\ofxLibwebsockets\libs\libwebsockets">
 			<UniqueIdentifier>{F5CB4033-7B46-FD26-E6BF-225D}</UniqueIdentifier>
 		</Filter>
@@ -86,12 +80,6 @@
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\src\ofxLibwebsockets.h">
 			<Filter>addons\ofxLibwebsockets\src</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h">
-			<Filter>addons\ofxLibwebsockets\libs\jsoncpp\json</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h">
-			<Filter>addons\ofxLibwebsockets\libs\jsoncpp\json</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h">
 			<Filter>addons\ofxLibwebsockets\libs\libwebsockets\include</Filter>
 		</ClInclude>