Skip to content

Instantly share code, notes, and snippets.

@bilderbuchi

bilderbuchi/develop-cbwizard.diff

Created August 30, 2012 16:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bilderbuchi/3532896 to your computer and use it in GitHub Desktop.
Save bilderbuchi/3532896 to your computer and use it in GitHub Desktop.
Download ZIP
diff between current develop and merged PR #1245
Raw
develop-cbwizard.diff
diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
index 4c960de..25bdf23 100644
--- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
+++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
@@ -144,12 +144,6 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/src" />
</Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
@@ -237,5 +231,11 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
index d2f5477..39f65af 100644
--- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
+++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
@@ -107,8 +107,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
@@ -138,6 +136,8 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
index de96ba2..b0a4d38 100644
--- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
@@ -50,12 +50,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
<Filter>addons\ofxAssimpModelLoader\src</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
@@ -143,5 +137,11 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
index 6d3b4b8..9ab840f 100644
--- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
@@ -9,6 +9,50 @@
<string>42</string>
<key>objects</key>
<dict>
+ <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>pushpack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>93a9152986a73da32dbd796433b96c9f</key>
+ <dict>
+ <key>children</key>
+ <array>
+ <string>1aa18353f9701b01731dfadf228466c5</string>
+ <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
+ </array>
+ <key>isa</key>
+ <string>PBXGroup</string>
+ <key>name</key>
+ <string>Compiler</string>
+ <key>sourceTree</key>
+ <string>&lt;group&gt;</string>
+ </dict>
+ <key>1aa18353f9701b01731dfadf228466c5</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>poppack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>53ea0e889f34624ce3313e04cd77bdc4</key>
<dict>
<key>explicitFileType</key>
@@ -429,55 +473,10 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>DefaultLogger.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>pushpack1.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>93a9152986a73da32dbd796433b96c9f</key>
- <dict>
- <key>children</key>
- <array>
- <string>1aa18353f9701b01731dfadf228466c5</string>
- <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Compiler</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
<key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
<dict>
<key>children</key>
<array>
- <string>93a9152986a73da32dbd796433b96c9f</string>
<string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
<string>cc940533e79102644e0eba5599fb0fb6</string>
<string>8ebbbb59caed1e54f37c7038f27990ee</string>
@@ -507,6 +506,7 @@
<string>c72403edcb7dcaec60d1dcdd13017e0c</string>
<string>564045ef0424b7037832d90382f88900</string>
<string>53ea0e889f34624ce3313e04cd77bdc4</string>
+ <string>93a9152986a73da32dbd796433b96c9f</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -541,7 +541,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1aa18353f9701b01731dfadf228466c5</key>
+ <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -550,9 +550,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>poppack1.h</string>
+ <string>DefaultLogger.h</string>
<key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
index 419be1d..6528162 100644
--- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
+++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
@@ -127,6 +127,15 @@
<debugger />
<envvars />
</Extensions>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
<Unit filename="../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h">
<Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
</Unit>
@@ -142,14 +151,5 @@
<Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.h">
<Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
</Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
index 474f238..5ed2d39 100644
--- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
+++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
@@ -100,17 +100,17 @@
<ItemGroup>
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\testApp.cpp" />
+ <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp" />
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp" />
- <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\testApp.h" />
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h" />
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
index 56b4749..087590f 100644
--- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
@@ -7,15 +7,15 @@
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
@@ -38,6 +38,12 @@
<ClInclude Include="src\testApp.h">
<Filter>src</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClInclude>
@@ -47,11 +53,5 @@
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
index c7c325a..88baaa6 100644
--- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
@@ -9,58 +9,6 @@
<string>42</string>
<key>objects</key>
<dict>
- <key>59db8a662b2617751f4a94123a6e8f80</key>
- <dict>
- <key>fileRef</key>
- <string>f19ab0f312d36358fc181e5b50be8b71</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>f19ab0f312d36358fc181e5b50be8b71</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.cpp.cpp</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3dModelLoader.cpp</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>6a430934ff822613cc649f404e58f939</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3DModelLoader.h</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>3ff4c30062c687195b53f1f90832fb81</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3DBaseLoader.h</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>e99f05e7cac8bdef4b1d0c0b1f134f6c</key>
<dict>
<key>explicitFileType</key>
@@ -152,14 +100,66 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
+ <key>1f75a6d2a65723a63e2341dbc35861cf</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>Vector3DS.h</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>59db8a662b2617751f4a94123a6e8f80</key>
+ <dict>
+ <key>fileRef</key>
+ <string>f19ab0f312d36358fc181e5b50be8b71</string>
+ <key>isa</key>
+ <string>PBXBuildFile</string>
+ </dict>
+ <key>f19ab0f312d36358fc181e5b50be8b71</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.cpp.cpp</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>ofx3dModelLoader.cpp</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>6a430934ff822613cc649f404e58f939</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>ofx3DModelLoader.h</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>e8d037ddfdfb2ec263740ac3f0c5db8f</key>
<dict>
<key>children</key>
<array>
- <string>ed90198659e5967fb2ea39d72ece86b8</string>
<string>3ff4c30062c687195b53f1f90832fb81</string>
<string>6a430934ff822613cc649f404e58f939</string>
<string>f19ab0f312d36358fc181e5b50be8b71</string>
+ <string>ed90198659e5967fb2ea39d72ece86b8</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -181,7 +181,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1f75a6d2a65723a63e2341dbc35861cf</key>
+ <key>3ff4c30062c687195b53f1f90832fb81</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -190,9 +190,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>Vector3DS.h</string>
+ <string>ofx3DBaseLoader.h</string>
<key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
@@ -717,9 +717,9 @@
<array>
<string>E4B69E200A3A1BDC003C02F2</string>
<string>E4B69E210A3A1BDC003C02F2</string>
+ <string>59db8a662b2617751f4a94123a6e8f80</string>
<string>4e322024174afb49a3bea15285a09d6a</string>
<string>c2b7714e50909a7bcae5a51c9821f98a</string>
- <string>59db8a662b2617751f4a94123a6e8f80</string>
</array>
<key>isa</key>
<string>PBXSourcesBuildPhase</string>
diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
index f594dc1..1e2bc8e 100644
--- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
+++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
@@ -193,6 +193,15 @@
<debugger />
<envvars />
</Extensions>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
+ <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
+ <Option virtualFolder="addons/ofx3DModelLoader/src" />
+ </Unit>
<Unit filename="../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h">
<Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
</Unit>
@@ -208,15 +217,6 @@
<Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.h">
<Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
</Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
- <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
- <Option virtualFolder="addons/ofx3DModelLoader/src" />
- </Unit>
<Unit filename="../../../addons/ofxNetwork/src/ofxNetwork.h">
<Option virtualFolder="addons/ofxNetwork/src" />
</Unit>
@@ -529,9 +529,6 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
</Unit>
- <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
- <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
- </Unit>
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
</Unit>
@@ -547,6 +544,9 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
</Unit>
+ <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
+ <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
+ </Unit>
<Unit filename="../../../addons/ofxOsc/src/ofxOsc.h">
<Option virtualFolder="addons/ofxOsc/src" />
</Unit>
@@ -688,12 +688,6 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/src" />
</Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
@@ -781,6 +775,12 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
<Unit filename="../../../addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp">
<Option virtualFolder="addons/ofxThreadedImageLoader/src" />
</Unit>
diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
index fa3acd5..082d0c1 100644
--- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
+++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
@@ -100,9 +100,9 @@
<ItemGroup>
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\testApp.cpp" />
+ <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp" />
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp" />
- <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
<ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.cpp" />
<ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPManager.cpp" />
<ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPServer.cpp" />
@@ -138,11 +138,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\testApp.h" />
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.h" />
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h" />
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
<ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetwork.h" />
<ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetworkUtils.h" />
<ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.h" />
@@ -236,12 +236,12 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
<ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOsc.h" />
<ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOscArg.h" />
<ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOscBundle.h" />
@@ -269,8 +269,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
@@ -300,6 +298,8 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
<ClInclude Include="..\..\..\addons\ofxThreadedImageLoader\src\ofxThreadedImageLoader.h" />
</ItemGroup>
<ItemGroup>
diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
index 443d521..a8f744e 100644
--- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
@@ -7,15 +7,15 @@
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.cpp">
<Filter>addons\ofxNetwork\src</Filter>
</ClCompile>
@@ -269,6 +269,12 @@
<ClInclude Include="src\testApp.h">
<Filter>src</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
+ <Filter>addons\ofx3DModelLoader\src</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClInclude>
@@ -278,12 +284,6 @@
<ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h">
<Filter>addons\ofx3DModelLoader\src\3DS</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
- <Filter>addons\ofx3DModelLoader\src</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetwork.h">
<Filter>addons\ofxNetwork\src</Filter>
</ClInclude>
@@ -563,9 +563,6 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
- <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
</ClInclude>
@@ -581,6 +578,9 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
+ <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOsc.h">
<Filter>addons\ofxOsc\src</Filter>
</ClInclude>
@@ -662,12 +662,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
<Filter>addons\ofxAssimpModelLoader\src</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
@@ -755,6 +749,12 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\addons\ofxThreadedImageLoader\src\ofxThreadedImageLoader.h">
<Filter>addons\ofxThreadedImageLoader\src</Filter>
</ClInclude>
diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
index d712a93..06164d9 100644
--- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
@@ -73,6 +73,50 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
+ <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>pushpack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>93a9152986a73da32dbd796433b96c9f</key>
+ <dict>
+ <key>children</key>
+ <array>
+ <string>1aa18353f9701b01731dfadf228466c5</string>
+ <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
+ </array>
+ <key>isa</key>
+ <string>PBXGroup</string>
+ <key>name</key>
+ <string>Compiler</string>
+ <key>sourceTree</key>
+ <string>&lt;group&gt;</string>
+ </dict>
+ <key>1aa18353f9701b01731dfadf228466c5</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>poppack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>53ea0e889f34624ce3313e04cd77bdc4</key>
<dict>
<key>explicitFileType</key>
@@ -493,55 +537,10 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>DefaultLogger.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>pushpack1.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>93a9152986a73da32dbd796433b96c9f</key>
- <dict>
- <key>children</key>
- <array>
- <string>1aa18353f9701b01731dfadf228466c5</string>
- <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Compiler</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
<key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
<dict>
<key>children</key>
<array>
- <string>93a9152986a73da32dbd796433b96c9f</string>
<string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
<string>cc940533e79102644e0eba5599fb0fb6</string>
<string>8ebbbb59caed1e54f37c7038f27990ee</string>
@@ -571,6 +570,7 @@
<string>c72403edcb7dcaec60d1dcdd13017e0c</string>
<string>564045ef0424b7037832d90382f88900</string>
<string>53ea0e889f34624ce3313e04cd77bdc4</string>
+ <string>93a9152986a73da32dbd796433b96c9f</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -605,7 +605,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1aa18353f9701b01731dfadf228466c5</key>
+ <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -614,9 +614,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>poppack1.h</string>
+ <string>DefaultLogger.h</string>
<key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
@@ -1730,6 +1730,21 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -1834,21 +1849,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -3021,9 +3021,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -3851,58 +3851,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>59db8a662b2617751f4a94123a6e8f80</key>
- <dict>
- <key>fileRef</key>
- <string>f19ab0f312d36358fc181e5b50be8b71</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>f19ab0f312d36358fc181e5b50be8b71</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.cpp.cpp</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3dModelLoader.cpp</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>6a430934ff822613cc649f404e58f939</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3DModelLoader.h</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>3ff4c30062c687195b53f1f90832fb81</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>ofx3DBaseLoader.h</string>
- <key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>e99f05e7cac8bdef4b1d0c0b1f134f6c</key>
<dict>
<key>explicitFileType</key>
@@ -3994,14 +3942,66 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
+ <key>1f75a6d2a65723a63e2341dbc35861cf</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>Vector3DS.h</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>59db8a662b2617751f4a94123a6e8f80</key>
+ <dict>
+ <key>fileRef</key>
+ <string>f19ab0f312d36358fc181e5b50be8b71</string>
+ <key>isa</key>
+ <string>PBXBuildFile</string>
+ </dict>
+ <key>f19ab0f312d36358fc181e5b50be8b71</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.cpp.cpp</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>ofx3dModelLoader.cpp</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>6a430934ff822613cc649f404e58f939</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>ofx3DModelLoader.h</string>
+ <key>path</key>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>e8d037ddfdfb2ec263740ac3f0c5db8f</key>
<dict>
<key>children</key>
<array>
- <string>ed90198659e5967fb2ea39d72ece86b8</string>
<string>3ff4c30062c687195b53f1f90832fb81</string>
<string>6a430934ff822613cc649f404e58f939</string>
<string>f19ab0f312d36358fc181e5b50be8b71</string>
+ <string>ed90198659e5967fb2ea39d72ece86b8</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -4023,7 +4023,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1f75a6d2a65723a63e2341dbc35861cf</key>
+ <key>3ff4c30062c687195b53f1f90832fb81</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -4032,9 +4032,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>Vector3DS.h</string>
+ <string>ofx3DBaseLoader.h</string>
<key>path</key>
- <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
+ <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
@@ -4678,9 +4678,9 @@
<array>
<string>E4B69E200A3A1BDC003C02F2</string>
<string>E4B69E210A3A1BDC003C02F2</string>
+ <string>59db8a662b2617751f4a94123a6e8f80</string>
<string>4e322024174afb49a3bea15285a09d6a</string>
<string>c2b7714e50909a7bcae5a51c9821f98a</string>
- <string>59db8a662b2617751f4a94123a6e8f80</string>
<string>960d20b191346612d5c05a6af838c285</string>
<string>125506cd3e5f428aafe5cc657e873ba0</string>
<string>66ca411c5a9664e27326bf369079f00e</string>
diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.cbp b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
index 406bbaf..7ed0555 100644
--- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
+++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
@@ -144,12 +144,6 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/src" />
</Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
- <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
- <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
- </Unit>
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
@@ -237,5 +231,11 @@
<Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
<Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
</Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
+ <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
+ <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
+ </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
index 8ec4ad9..40530e1 100644
--- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
+++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
@@ -107,8 +107,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
@@ -138,6 +136,8 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
index de96ba2..b0a4d38 100644
--- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
@@ -50,12 +50,6 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
<Filter>addons\ofxAssimpModelLoader\src</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
- <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
@@ -143,5 +137,11 @@
<ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
<Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
+ <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
index 1811420..fbf8d5c 100644
--- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
@@ -9,6 +9,50 @@
<string>42</string>
<key>objects</key>
<dict>
+ <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>pushpack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>93a9152986a73da32dbd796433b96c9f</key>
+ <dict>
+ <key>children</key>
+ <array>
+ <string>1aa18353f9701b01731dfadf228466c5</string>
+ <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
+ </array>
+ <key>isa</key>
+ <string>PBXGroup</string>
+ <key>name</key>
+ <string>Compiler</string>
+ <key>sourceTree</key>
+ <string>&lt;group&gt;</string>
+ </dict>
+ <key>1aa18353f9701b01731dfadf228466c5</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>poppack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>53ea0e889f34624ce3313e04cd77bdc4</key>
<dict>
<key>explicitFileType</key>
@@ -429,55 +473,10 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>DefaultLogger.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>pushpack1.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>93a9152986a73da32dbd796433b96c9f</key>
- <dict>
- <key>children</key>
- <array>
- <string>1aa18353f9701b01731dfadf228466c5</string>
- <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Compiler</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
<key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
<dict>
<key>children</key>
<array>
- <string>93a9152986a73da32dbd796433b96c9f</string>
<string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
<string>cc940533e79102644e0eba5599fb0fb6</string>
<string>8ebbbb59caed1e54f37c7038f27990ee</string>
@@ -507,6 +506,7 @@
<string>c72403edcb7dcaec60d1dcdd13017e0c</string>
<string>564045ef0424b7037832d90382f88900</string>
<string>53ea0e889f34624ce3313e04cd77bdc4</string>
+ <string>93a9152986a73da32dbd796433b96c9f</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -541,7 +541,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1aa18353f9701b01731dfadf228466c5</key>
+ <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -550,9 +550,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>poppack1.h</string>
+ <string>DefaultLogger.h</string>
<key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.cbp b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
index 442447a..a4261e0 100644
--- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
+++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
@@ -442,9 +442,6 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
</Unit>
- <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
- <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
- </Unit>
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
</Unit>
@@ -460,5 +457,8 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
</Unit>
+ <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
+ <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
+ </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
index f8c7a1c..db23512 100644
--- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
+++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
@@ -197,12 +197,12 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
index 6d8abd3..03762e8 100644
--- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
@@ -362,9 +362,6 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
- <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
</ClInclude>
@@ -380,5 +377,8 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
+ <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
index 693b5d8..10e79cd 100644
--- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
@@ -9,6 +9,21 @@
<string>42</string>
<key>objects</key>
<dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -113,21 +128,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -1300,9 +1300,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
index 8b90921..7eb6678 100644
--- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
+++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
@@ -442,9 +442,6 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
</Unit>
- <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
- <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
- </Unit>
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
</Unit>
@@ -460,5 +457,8 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
</Unit>
+ <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
+ <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
+ </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
index 734a73f..57ae00f 100644
--- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
+++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
@@ -197,12 +197,12 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
index 6d8abd3..03762e8 100644
--- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
@@ -362,9 +362,6 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
- <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
</ClInclude>
@@ -380,5 +377,8 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
+ <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
index 1cf6da9..88fbd42 100644
--- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
@@ -9,6 +9,21 @@
<string>42</string>
<key>objects</key>
<dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -113,21 +128,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -1300,9 +1300,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
index df175ff..7097671 100644
--- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
+++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
@@ -442,9 +442,6 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
</Unit>
- <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
- <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
- </Unit>
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
</Unit>
@@ -460,5 +457,8 @@
<Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
<Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
</Unit>
+ <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
+ <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
+ </Unit>
</Project>
</CodeBlocks_project_file>
diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
index a298a5a..5c9e983 100644
--- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
+++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
@@ -197,12 +197,12 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
index 6d8abd3..03762e8 100644
--- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
+++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
@@ -362,9 +362,6 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
- <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
</ClInclude>
@@ -380,5 +377,8 @@
<ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
<Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
+ <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
index 3aab171..dd6d482 100644
--- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
@@ -9,6 +9,21 @@
<string>42</string>
<key>objects</key>
<dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -113,21 +128,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -1300,9 +1300,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
diff --git a/dev-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
index 922247b..28c0e84 100644
--- a/dev-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
@@ -9,6 +9,50 @@
<string>45</string>
<key>objects</key>
<dict>
+ <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>pushpack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
+ <key>93a9152986a73da32dbd796433b96c9f</key>
+ <dict>
+ <key>children</key>
+ <array>
+ <string>1aa18353f9701b01731dfadf228466c5</string>
+ <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
+ </array>
+ <key>isa</key>
+ <string>PBXGroup</string>
+ <key>name</key>
+ <string>Compiler</string>
+ <key>sourceTree</key>
+ <string>&lt;group&gt;</string>
+ </dict>
+ <key>1aa18353f9701b01731dfadf228466c5</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>poppack1.h</string>
+ <key>path</key>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>53ea0e889f34624ce3313e04cd77bdc4</key>
<dict>
<key>explicitFileType</key>
@@ -429,55 +473,10 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>DefaultLogger.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>pushpack1.h</string>
- <key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>93a9152986a73da32dbd796433b96c9f</key>
- <dict>
- <key>children</key>
- <array>
- <string>1aa18353f9701b01731dfadf228466c5</string>
- <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Compiler</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
<key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
<dict>
<key>children</key>
<array>
- <string>93a9152986a73da32dbd796433b96c9f</string>
<string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
<string>cc940533e79102644e0eba5599fb0fb6</string>
<string>8ebbbb59caed1e54f37c7038f27990ee</string>
@@ -507,6 +506,7 @@
<string>c72403edcb7dcaec60d1dcdd13017e0c</string>
<string>564045ef0424b7037832d90382f88900</string>
<string>53ea0e889f34624ce3313e04cd77bdc4</string>
+ <string>93a9152986a73da32dbd796433b96c9f</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
@@ -541,7 +541,7 @@
<key>sourceTree</key>
<string>&lt;group&gt;</string>
</dict>
- <key>1aa18353f9701b01731dfadf228466c5</key>
+ <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
<dict>
<key>explicitFileType</key>
<string>sourcecode.c.h</string>
@@ -550,9 +550,9 @@
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
- <string>poppack1.h</string>
+ <string>DefaultLogger.h</string>
<key>path</key>
- <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
+ <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
diff --git a/dev-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
index 94b9c4a..a5e19d9 100644
--- a/dev-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
@@ -9,6 +9,21 @@
<string>45</string>
<key>objects</key>
<dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -113,21 +128,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -1300,9 +1300,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
diff --git a/dev-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
index 688c4f4..0151985 100644
--- a/dev-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
+++ b/pierre-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
@@ -9,6 +9,21 @@
<string>45</string>
<key>objects</key>
<dict>
+ <key>9b7d592e7ab311451a27c46e68e8680d</key>
+ <dict>
+ <key>explicitFileType</key>
+ <string>sourcecode.c.h</string>
+ <key>fileEncoding</key>
+ <string>30</string>
+ <key>isa</key>
+ <string>PBXFileReference</string>
+ <key>name</key>
+ <string>opencv.hpp</string>
+ <key>path</key>
+ <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
+ <key>sourceTree</key>
+ <string>SOURCE_ROOT</string>
+ </dict>
<key>97fbd89e6180673035ad1083e6afc93e</key>
<dict>
<key>explicitFileType</key>
@@ -113,21 +128,6 @@
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
</dict>
- <key>9b7d592e7ab311451a27c46e68e8680d</key>
- <dict>
- <key>explicitFileType</key>
- <string>sourcecode.c.h</string>
- <key>fileEncoding</key>
- <string>30</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>opencv.hpp</string>
- <key>path</key>
- <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
<key>d0cafe48ee488eeed9149670a8175de8</key>
<dict>
<key>children</key>
@@ -1300,9 +1300,9 @@
<string>961a625bd21068033782887c0c93e535</string>
<string>0f288fd421d474f4ae2684d36104f270</string>
<string>d0cafe48ee488eeed9149670a8175de8</string>
- <string>9b7d592e7ab311451a27c46e68e8680d</string>
<string>0478e60892bf4c0731ae0763e72eb53d</string>
<string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
+ <string>9b7d592e7ab311451a27c46e68e8680d</string>
</array>
<key>isa</key>
<string>PBXGroup</string>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment