Skip to content

Commit

Permalink
update vc2013 project for new jsoncpp sources
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardeakin
richardeakin committed Jan 23, 2015
1 parent 89aa67b commit b211e18
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 71 deletions.
28 changes: 7 additions & 21 deletions vc2013/cinder.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;..\src\r8brain;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\include\jsoncpp;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;..\src\r8brain;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -114,7 +114,7 @@
<ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\r8brain;..\src\linebreak;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\include\jsoncpp;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\r8brain;..\src\linebreak;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -141,7 +141,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;..\src\r8brain;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\include\jsoncpp;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;..\src\r8brain;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand All @@ -167,7 +167,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\r8brain;..\src\linebreak;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw;..\include\oggvorbis;..\include\jsoncpp;..\blocks\QuickTime\include\msw;..\src\AntTweakBar;..\src\libtess2;..\src\r8brain;..\src\linebreak;..\src\DxShaders;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
Expand Down Expand Up @@ -339,9 +339,7 @@
<ClCompile Include="..\src\AntTweakBar\TwMgr.cpp" />
<ClCompile Include="..\src\AntTweakBar\TwOpenGL.cpp" />
<ClCompile Include="..\src\AntTweakBar\TwPrecomp.cpp" />
<ClCompile Include="..\src\jsoncpp\json_reader.cpp" />
<ClCompile Include="..\src\jsoncpp\json_value.cpp" />
<ClCompile Include="..\src\jsoncpp\json_writer.cpp" />
<ClCompile Include="..\src\jsoncpp\jsoncpp.cpp" />
<ClCompile Include="..\src\libtess2\bucketalloc.c" />
<ClCompile Include="..\src\libtess2\dict.c" />
<ClCompile Include="..\src\libtess2\geom.c" />
Expand Down Expand Up @@ -471,14 +469,8 @@
<ClInclude Include="..\include\cinder\Tween.h" />
<ClInclude Include="..\include\cinder\Unicode.h" />
<ClInclude Include="..\include\cinder\UrlImplWinInet.h" />
<ClInclude Include="..\include\json\autolink.h" />
<ClInclude Include="..\include\json\config.h" />
<ClInclude Include="..\include\json\features.h" />
<ClInclude Include="..\include\json\forwards.h" />
<ClInclude Include="..\include\json\json.h" />
<ClInclude Include="..\include\json\reader.h" />
<ClInclude Include="..\include\json\value.h" />
<ClInclude Include="..\include\json\writer.h" />
<ClInclude Include="..\include\jsoncpp\json\json-forwards.h" />
<ClInclude Include="..\include\jsoncpp\json\json.h" />
<ClInclude Include="..\include\rapidxml\rapidxml.hpp" />
<ClInclude Include="..\include\rapidxml\rapidxml_print.hpp" />
<ClInclude Include="..\src\AntTweakBar\AntPerfTimer.h" />
Expand Down Expand Up @@ -585,7 +577,6 @@
<ClInclude Include="..\include\cinder\msw\OutputDebugStringStream.h" />
<ClInclude Include="..\include\cinder\params\Params.h" />
<ClInclude Include="..\include\msw\videoInput\videoInput.h" />
<ClInclude Include="..\src\jsoncpp\json_batchallocator.h" />
<ClInclude Include="..\src\libtess2\bucketalloc.h" />
<ClInclude Include="..\src\libtess2\dict.h" />
<ClInclude Include="..\src\libtess2\geom.h" />
Expand Down Expand Up @@ -646,11 +637,6 @@
<ClInclude Include="..\src\r8brain\r8bbase.h" />
<ClInclude Include="..\src\r8brain\r8bconf.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\src\jsoncpp\json_internalarray.inl" />
<None Include="..\src\jsoncpp\json_internalmap.inl" />
<None Include="..\src\jsoncpp\json_valueiterator.inl" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
65 changes: 15 additions & 50 deletions vc2013/cinder.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
<Filter Include="Source Files\jsoncpp">
<UniqueIdentifier>{13c0913f-8fdb-4945-a68a-6b210c4e8d91}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\json">
<UniqueIdentifier>{1f0d2d7b-fc30-443d-a52d-dd3867811355}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\svg">
<UniqueIdentifier>{74f66efa-5b4e-49f4-8ea2-21b75f65a52e}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -136,6 +133,12 @@
<Filter Include="Source Files\oggvorbis\vorbis\modes">
<UniqueIdentifier>{54a3930c-e7ed-418e-83b6-977db7fadc51}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\jsoncpp">
<UniqueIdentifier>{89f1b95b-57f6-4a4d-8cec-0c0b6d1cd298}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\jsoncpp\json">
<UniqueIdentifier>{aecdcab0-b410-4781-a321-a61b4e0cdcc8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cinder\Area.cpp">
Expand Down Expand Up @@ -435,15 +438,6 @@
<ClCompile Include="..\src\cinder\Base64.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\jsoncpp\json_reader.cpp">
<Filter>Source Files\jsoncpp</Filter>
</ClCompile>
<ClCompile Include="..\src\jsoncpp\json_value.cpp">
<Filter>Source Files\jsoncpp</Filter>
</ClCompile>
<ClCompile Include="..\src\jsoncpp\json_writer.cpp">
<Filter>Source Files\jsoncpp</Filter>
</ClCompile>
<ClCompile Include="..\src\cinder\Json.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -693,6 +687,9 @@
<ClCompile Include="..\src\cinder\CinderAssert.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\jsoncpp\jsoncpp.cpp">
<Filter>Source Files\jsoncpp</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\AntTweakBar\AntPerfTimer.h">
Expand Down Expand Up @@ -1100,36 +1097,9 @@
<ClInclude Include="..\include\cinder\Plane.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\json\autolink.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\config.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\features.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\forwards.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\json.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\reader.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\value.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\json\writer.h">
<Filter>Header Files\json</Filter>
</ClInclude>
<ClInclude Include="..\include\cinder\Json.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\jsoncpp\json_batchallocator.h">
<Filter>Source Files\jsoncpp</Filter>
</ClInclude>
<ClInclude Include="..\include\cinder\svg\Svg.h">
<Filter>Header Files\svg</Filter>
</ClInclude>
Expand Down Expand Up @@ -1478,16 +1448,11 @@
<ClInclude Include="..\include\cinder\CurrentFunction.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\src\jsoncpp\json_internalarray.inl">
<Filter>Source Files\jsoncpp</Filter>
</None>
<None Include="..\src\jsoncpp\json_internalmap.inl">
<Filter>Source Files\jsoncpp</Filter>
</None>
<None Include="..\src\jsoncpp\json_valueiterator.inl">
<Filter>Source Files\jsoncpp</Filter>
</None>
<ClInclude Include="..\include\jsoncpp\json\json.h">
<Filter>Header Files\jsoncpp\json</Filter>
</ClInclude>
<ClInclude Include="..\include\jsoncpp\json\json-forwards.h">
<Filter>Header Files\jsoncpp\json</Filter>
</ClInclude>
</ItemGroup>
</Project>

0 comments on commit b211e18

Please sign in to comment.