Skip to content

Commit 5d2fd8e

Browse files
robotconsciencerobotconscience
committed
Reverted to jsonpp
1 parent c9a9655 commit 5d2fd8e

File tree

52 files changed

+9574
-1471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+9574
-1471
lines changed

‎example_client_blob/example_client_blob.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<ItemGroup>
174174
<ClCompile Include="src\main.cpp" />
175175
<ClCompile Include="src\ofApp.cpp" />
176+
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\jsoncpp.cpp" />
176177
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Client.cpp" />
177178
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Connection.cpp" />
178179
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Events.cpp" />
@@ -185,6 +186,8 @@
185186
<ItemGroup>
186187
<ClInclude Include="src\ofApp.h" />
187188
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\src\ofxLibwebsockets.h" />
189+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h" />
190+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h" />
188191
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h" />
189192
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\lws_config.h" />
190193
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Client.h" />

‎example_client_blob/example_client_blob.vcxproj.filters

+15
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<ClCompile Include="src\main.cpp">
88
<Filter>src</Filter>
99
</ClCompile>
10+
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\jsoncpp.cpp">
11+
<Filter>addons\ofxLibwebsockets\libs\jsoncpp</Filter>
12+
</ClCompile>
1013
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Client.cpp">
1114
<Filter>addons\ofxLibwebsockets\libs\ofxLibwebsockets\src</Filter>
1215
</ClCompile>
@@ -48,6 +51,12 @@
4851
<Filter Include="addons\ofxLibwebsockets\libs">
4952
<UniqueIdentifier>{93A2255B-E819-7999-658F-5C8B}</UniqueIdentifier>
5053
</Filter>
54+
<Filter Include="addons\ofxLibwebsockets\libs\jsoncpp">
55+
<UniqueIdentifier>{EDF3DFA8-3A48-F2BE-828A-56B4}</UniqueIdentifier>
56+
</Filter>
57+
<Filter Include="addons\ofxLibwebsockets\libs\jsoncpp\json">
58+
<UniqueIdentifier>{E61DA5C1-FC26-09C7-51F3-45B4}</UniqueIdentifier>
59+
</Filter>
5160
<Filter Include="addons\ofxLibwebsockets\libs\libwebsockets">
5261
<UniqueIdentifier>{F5CB4033-7B46-FD26-E6BF-225D}</UniqueIdentifier>
5362
</Filter>
@@ -80,6 +89,12 @@
8089
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\src\ofxLibwebsockets.h">
8190
<Filter>addons\ofxLibwebsockets\src</Filter>
8291
</ClInclude>
92+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h">
93+
<Filter>addons\ofxLibwebsockets\libs\jsoncpp\json</Filter>
94+
</ClInclude>
95+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h">
96+
<Filter>addons\ofxLibwebsockets\libs\jsoncpp\json</Filter>
97+
</ClInclude>
8398
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h">
8499
<Filter>addons\ofxLibwebsockets\libs\libwebsockets\include</Filter>
85100
</ClInclude>

‎example_client_blob/example_client_blob.xcodeproj/project.pbxproj

+246-6
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,91 @@
439439
<key>sourceTree</key>
440440
<string>&lt;group&gt;</string>
441441
</dict>
442+
<key>75DCA31CF0745355CC4AD2DD</key>
443+
<dict>
444+
<key>explicitFileType</key>
445+
<string>sourcecode.c.h</string>
446+
<key>fileEncoding</key>
447+
<string>30</string>
448+
<key>isa</key>
449+
<string>PBXFileReference</string>
450+
<key>name</key>
451+
<string>libwebsockets.h</string>
452+
<key>path</key>
453+
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/include/libwebsockets.h</string>
454+
<key>sourceTree</key>
455+
<string>SOURCE_ROOT</string>
456+
</dict>
457+
<key>9EF1133BC23669A5C94FE30F</key>
458+
<dict>
459+
<key>fileRef</key>
460+
<string>69668FDE141262BC3C6CA929</string>
461+
<key>isa</key>
462+
<string>PBXBuildFile</string>
463+
</dict>
464+
<key>69668FDE141262BC3C6CA929</key>
465+
<dict>
466+
<key>explicitFileType</key>
467+
<string>sourcecode.cpp.cpp</string>
468+
<key>fileEncoding</key>
469+
<string>30</string>
470+
<key>isa</key>
471+
<string>PBXFileReference</string>
472+
<key>name</key>
473+
<string>jsoncpp.cpp</string>
474+
<key>path</key>
475+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp/jsoncpp.cpp</string>
476+
<key>sourceTree</key>
477+
<string>SOURCE_ROOT</string>
478+
</dict>
479+
<key>EC14FAAFBB1143E1C64BF2C3</key>
480+
<dict>
481+
<key>explicitFileType</key>
482+
<string>sourcecode.c.h</string>
483+
<key>fileEncoding</key>
484+
<string>30</string>
485+
<key>isa</key>
486+
<string>PBXFileReference</string>
487+
<key>name</key>
488+
<string>json.h</string>
489+
<key>path</key>
490+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp/json/json.h</string>
491+
<key>sourceTree</key>
492+
<string>SOURCE_ROOT</string>
493+
</dict>
494+
<key>12CA34DA3B4F71871CBFA23A</key>
495+
<dict>
496+
<key>children</key>
497+
<array>
498+
<string>123354539C152F1EE3FFC190</string>
499+
<string>EC14FAAFBB1143E1C64BF2C3</string>
500+
</array>
501+
<key>isa</key>
502+
<string>PBXGroup</string>
503+
<key>name</key>
504+
<string>json</string>
505+
<key>sourceTree</key>
506+
<string>&lt;group&gt;</string>
507+
</dict>
508+
<key>5AC16A8D6EC87B59A03906C1</key>
509+
<dict>
510+
<key>children</key>
511+
<array>
512+
<string>12CA34DA3B4F71871CBFA23A</string>
513+
<string>69668FDE141262BC3C6CA929</string>
514+
</array>
515+
<key>isa</key>
516+
<string>PBXGroup</string>
517+
<key>name</key>
518+
<string>jsoncpp</string>
519+
<key>sourceTree</key>
520+
<string>&lt;group&gt;</string>
521+
</dict>
442522
<key>70911A54686309FC932B3014</key>
443523
<dict>
444524
<key>children</key>
445525
<array>
526+
<string>5AC16A8D6EC87B59A03906C1</string>
446527
<string>CB67BAA20E44B0F45701C777</string>
447528
<string>AB97697EC6F10E7234EFF261</string>
448529
</array>
@@ -453,7 +534,7 @@
453534
<key>sourceTree</key>
454535
<string>&lt;group&gt;</string>
455536
</dict>
456-
<key>75DCA31CF0745355CC4AD2DD</key>
537+
<key>123354539C152F1EE3FFC190</key>
457538
<dict>
458539
<key>explicitFileType</key>
459540
<string>sourcecode.c.h</string>
@@ -462,9 +543,9 @@
462543
<key>isa</key>
463544
<string>PBXFileReference</string>
464545
<key>name</key>
465-
<string>libwebsockets.h</string>
546+
<string>json-forwards.h</string>
466547
<key>path</key>
467-
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/include/libwebsockets.h</string>
548+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp/json/json-forwards.h</string>
468549
<key>sourceTree</key>
469550
<string>SOURCE_ROOT</string>
470551
</dict>
@@ -538,7 +619,15 @@
538619
<key>shellPath</key>
539620
<string>/bin/sh</string>
540621
<key>shellScript</key>
541-
<string># ---- Code Sign App Package ----
622+
<string>echo "$GCC_PREPROCESSOR_DEFINITIONS";
623+
APPSTORE=`expr "$GCC_PREPROCESSOR_DEFINITIONS" : ".*APPSTORE=\([0-9]*\)"`
624+
if [ -z "$APPSTORE" ] ; then
625+
echo "Note: Not copying bin/data to App Package or doing App Code signing. Use AppStore target for AppStore distribution";
626+
else
627+
# Copy bin/data into App/Resources
628+
rsync -avz --exclude='.DS_Store' "${SRCROOT}/bin/data/" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/"
629+
630+
# ---- Code Sign App Package ----
542631

543632
# WARNING: You may have to run Clean in Xcode after changing CODE_SIGN_IDENTITY!
544633

@@ -619,8 +708,150 @@ done
619708

620709
# Restore $IFS.
621710
IFS=$SAVED_IFS
711+
712+
fi
622713
</string>
623714
</dict>
715+
<key>99FA3DBB1C7456C400CFA0EE</key>
716+
<dict>
717+
<key>baseConfigurationReference</key>
718+
<string>E4EB6923138AFD0F00A09F29</string>
719+
<key>buildSettings</key>
720+
<dict>
721+
<key>OTHER_LDFLAGS</key>
722+
<array>
723+
<string>$(OF_CORE_FRAMEWORKS) $(OF_CORE_LIBS)</string>
724+
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a</string>
725+
<string>../../../addons/ofxTurboJpeg/libs/turbo-jpeg/lib/osx/libturbojpeg.dylib</string>
726+
</array>
727+
<key>HEADER_SEARCH_PATHS</key>
728+
<array>
729+
<string>$(OF_CORE_HEADERS)</string>
730+
<string>src</string>
731+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp</string>
732+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp/json</string>
733+
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/include/</string>
734+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include</string>
735+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include/ofxLibwebsockets</string>
736+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src</string>
737+
<string>../../../addons/ofxLibwebsockets/src</string>
738+
<string>../../../addons/ofxTurboJpeg/src/</string>
739+
<string>../../../addons/ofxTurboJpeg/libs/turbo-jpeg/include</string>
740+
</array>
741+
<key>CONFIGURATION_BUILD_DIR</key>
742+
<string>$(SRCROOT)/bin/</string>
743+
<key>COPY_PHASE_STRIP</key>
744+
<string>YES</string>
745+
<key>DEAD_CODE_STRIPPING</key>
746+
<string>YES</string>
747+
<key>GCC_AUTO_VECTORIZATION</key>
748+
<string>YES</string>
749+
<key>GCC_ENABLE_SSE3_EXTENSIONS</key>
750+
<string>YES</string>
751+
<key>GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS</key>
752+
<string>YES</string>
753+
<key>GCC_INLINES_ARE_PRIVATE_EXTERN</key>
754+
<string>NO</string>
755+
<key>GCC_OPTIMIZATION_LEVEL</key>
756+
<string>3</string>
757+
<key>GCC_PREPROCESSOR_DEFINITIONS[arch=*]</key>
758+
<string>DISTRIBUTION=1</string>
759+
<key>GCC_SYMBOLS_PRIVATE_EXTERN</key>
760+
<string>NO</string>
761+
<key>GCC_UNROLL_LOOPS</key>
762+
<string>YES</string>
763+
<key>GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS</key>
764+
<string>YES</string>
765+
<key>GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO</key>
766+
<string>NO</string>
767+
<key>GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL</key>
768+
<string>NO</string>
769+
<key>GCC_WARN_UNINITIALIZED_AUTOS</key>
770+
<string>NO</string>
771+
<key>GCC_WARN_UNUSED_VALUE</key>
772+
<string>NO</string>
773+
<key>GCC_WARN_UNUSED_VARIABLE</key>
774+
<string>NO</string>
775+
<key>MACOSX_DEPLOYMENT_TARGET</key>
776+
<string>10.8</string>
777+
<key>OTHER_CPLUSPLUSFLAGS</key>
778+
<array>
779+
<string>-D__MACOSX_CORE__</string>
780+
<string>-mtune=native</string>
781+
</array>
782+
<key>SDKROOT</key>
783+
<string>macosx</string>
784+
</dict>
785+
<key>isa</key>
786+
<string>XCBuildConfiguration</string>
787+
<key>name</key>
788+
<string>AppStore</string>
789+
</dict>
790+
<key>99FA3DBC1C7456C400CFA0EE</key>
791+
<dict>
792+
<key>baseConfigurationReference</key>
793+
<string>E4EB6923138AFD0F00A09F29</string>
794+
<key>buildSettings</key>
795+
<dict>
796+
<key>OTHER_LDFLAGS</key>
797+
<array>
798+
<string>$(OF_CORE_FRAMEWORKS) $(OF_CORE_LIBS)</string>
799+
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a</string>
800+
<string>../../../addons/ofxTurboJpeg/libs/turbo-jpeg/lib/osx/libturbojpeg.dylib</string>
801+
</array>
802+
<key>HEADER_SEARCH_PATHS</key>
803+
<array>
804+
<string>$(OF_CORE_HEADERS)</string>
805+
<string>src</string>
806+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp</string>
807+
<string>../../../addons/ofxLibwebsockets/libs/jsoncpp/json</string>
808+
<string>../../../addons/ofxLibwebsockets/libs/libwebsockets/include/</string>
809+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include</string>
810+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include/ofxLibwebsockets</string>
811+
<string>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src</string>
812+
<string>../../../addons/ofxLibwebsockets/src</string>
813+
<string>../../../addons/ofxTurboJpeg/src/</string>
814+
<string>../../../addons/ofxTurboJpeg/libs/turbo-jpeg/include</string>
815+
</array>
816+
<key>COMBINE_HIDPI_IMAGES</key>
817+
<string>YES</string>
818+
<key>COPY_PHASE_STRIP</key>
819+
<string>YES</string>
820+
<key>FRAMEWORK_SEARCH_PATHS</key>
821+
<array>
822+
<string>$(inherited)</string>
823+
<string>$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)</string>
824+
</array>
825+
<key>FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1</key>
826+
<string>"$(SRCROOT)/../../../libs/glut/lib/osx"</string>
827+
<key>GCC_GENERATE_DEBUGGING_SYMBOLS</key>
828+
<string>YES</string>
829+
<key>GCC_MODEL_TUNING</key>
830+
<string>NONE</string>
831+
<key>GCC_PREPROCESSOR_DEFINITIONS[arch=*]</key>
832+
<string>APPSTORE=1</string>
833+
<key>ICON</key>
834+
<string>$(ICON_NAME_RELEASE)</string>
835+
<key>ICON_FILE</key>
836+
<string>$(ICON_FILE_PATH)$(ICON)</string>
837+
<key>INFOPLIST_FILE</key>
838+
<string>openFrameworks-Info.plist</string>
839+
<key>INSTALL_PATH</key>
840+
<string>/Applications</string>
841+
<key>LIBRARY_SEARCH_PATHS</key>
842+
<string>$(inherited)</string>
843+
<key>PRODUCT_NAME</key>
844+
<string>$(TARGET_NAME)</string>
845+
<key>WRAPPER_EXTENSION</key>
846+
<string>app</string>
847+
<key>baseConfigurationReference</key>
848+
<string>E4EB6923138AFD0F00A09F29</string>
849+
</dict>
850+
<key>isa</key>
851+
<string>XCBuildConfiguration</string>
852+
<key>name</key>
853+
<string>AppStore</string>
854+
</dict>
624855
<key>BB4B014C10F69532006C3DED</key>
625856
<dict>
626857
<key>children</key>
@@ -763,6 +994,7 @@ IFS=$SAVED_IFS
763994
<array>
764995
<string>E4B69B4E0A3A1720003C02F2</string>
765996
<string>E4B69B4F0A3A1720003C02F2</string>
997+
<string>99FA3DBB1C7456C400CFA0EE</string>
766998
</array>
767999
<key>defaultConfigurationIsVisible</key>
7681000
<string>0</string>
@@ -925,6 +1157,7 @@ IFS=$SAVED_IFS
9251157
<array>
9261158
<string>E4B69E200A3A1BDC003C02F2</string>
9271159
<string>E4B69E210A3A1BDC003C02F2</string>
1160+
<string>9EF1133BC23669A5C94FE30F</string>
9281161
<string>C6C3882A0B0872D1485F3874</string>
9291162
<string>A78C77753D562AE8F0E928ED</string>
9301163
<string>F1AC6AEFB9B93C6AC45C9CA8</string>
@@ -1000,6 +1233,7 @@ IFS=$SAVED_IFS
10001233
<array>
10011234
<string>E4B69B600A3A1757003C02F2</string>
10021235
<string>E4B69B610A3A1757003C02F2</string>
1236+
<string>99FA3DBC1C7456C400CFA0EE</string>
10031237
</array>
10041238
<key>defaultConfigurationIsVisible</key>
10051239
<string>0</string>
@@ -1241,13 +1475,19 @@ IFS=$SAVED_IFS
12411475
<string>mkdir -p "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
12421476
# Copy default icon file into App/Resources
12431477
rsync -aved "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/"
1244-
# Copy bin/data into App/Resources
1245-
rsync -avz --exclude='.DS_Store' "${SRCROOT}/bin/data/" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/data/"
12461478
# Copy libfmod and change install directory for fmod to run
12471479
rsync -aved ../../../libs/fmodex/lib/osx/libfmodex.dylib "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/";
12481480
install_name_tool -change @executable_path/libfmodex.dylib @executable_path/../Frameworks/libfmodex.dylib "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME";
1481+
1482+
echo "$GCC_PREPROCESSOR_DEFINITIONS";
1483+
APPSTORE=`expr "$GCC_PREPROCESSOR_DEFINITIONS" : ".*APPSTORE=\([0-9]*\)"`
1484+
if [ -z "${APPSTORE}" ] ; then
1485+
echo "Copying GLUT framework";
12491486
# Copy GLUT framework (must remove for AppStore submissions)
12501487
rsync -aved ../../../libs/glut/lib/osx/GLUT.framework "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/"
1488+
else
1489+
echo "Not including GLUT";
1490+
fi
12511491
</string>
12521492
</dict>
12531493
<key>E4C2427710CC5ABF004149E2</key>

‎example_client_hello_world/example_client_hello_world.vcxproj

+3
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<ItemGroup>
174174
<ClCompile Include="src\main.cpp" />
175175
<ClCompile Include="src\ofApp.cpp" />
176+
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\jsoncpp.cpp" />
176177
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Client.cpp" />
177178
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Connection.cpp" />
178179
<ClCompile Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src\Events.cpp" />
@@ -184,6 +185,8 @@
184185
<ItemGroup>
185186
<ClInclude Include="src\ofApp.h" />
186187
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\src\ofxLibwebsockets.h" />
188+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json-forwards.h" />
189+
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json\json.h" />
187190
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\libwebsockets.h" />
188191
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\lws_config.h" />
189192
<ClInclude Include="..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets\Client.h" />

0 commit comments

Comments
 (0)