Permalink
Browse files

MSW build fixes for SVG merge

  • Loading branch information...
1 parent 472b137 commit 438d86348dc1b2da8eeec53e76fde3a622f986e0 @andrewfb andrewfb committed Apr 6, 2012
Showing with 45 additions and 4 deletions.
  1. +11 −3 vc10/cinder.vcxproj
  2. +34 −1 vc10/cinder.vcxproj.filters
View
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -49,7 +49,7 @@
<ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw\jpeg;..\include\msw;..\include\msw\cairo;..\..\QuickTimeSDK-7.3\CIncludes;..\src\AntTweakBar;..\src\libtess2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw\jpeg;..\include\msw;..\include\msw\cairo;..\..\QuickTimeSDK-7.3\CIncludes;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x05010200;CURL_STATICLIB;CAIRO_WIN32_STATIC_BUILD;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -75,7 +75,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw\jpeg;..\include\msw;..\include\msw\cairo;..\..\QuickTimeSDK-7.3\CIncludes;..\src\AntTweakBar;..\src\libtess2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\include;..\boost;..\include\msw\png;..\include\msw\zlib;..\include\msw\jpeg;..\include\msw;..\include\msw\cairo;..\..\QuickTimeSDK-7.3\CIncludes;..\src\AntTweakBar;..\src\libtess2;..\src\linebreak;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;NOMINMAX;_WIN32_WINNT=0x05010200;CURL_STATICLIB;CAIRO_WIN32_STATIC_BUILD;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -138,6 +138,7 @@
<ClCompile Include="..\src\cinder\Sphere.cpp" />
<ClCompile Include="..\src\cinder\Stream.cpp" />
<ClCompile Include="..\src\cinder\Surface.cpp" />
+ <ClCompile Include="..\src\cinder\svg\Svg.cpp" />
<ClCompile Include="..\src\cinder\System.cpp" />
<ClCompile Include="..\src\cinder\Text.cpp" />
<ClCompile Include="..\src\cinder\Timeline.cpp" />
@@ -146,6 +147,7 @@
<ClCompile Include="..\src\cinder\Triangulate.cpp" />
<ClCompile Include="..\src\cinder\TriMesh.cpp" />
<ClCompile Include="..\src\cinder\Tween.cpp" />
+ <ClCompile Include="..\src\cinder\Unicode.cpp" />
<ClCompile Include="..\src\cinder\Url.cpp" />
<ClCompile Include="..\src\cinder\UrlImplWinInet.cpp" />
<ClCompile Include="..\src\cinder\Utilities.cpp" />
@@ -206,6 +208,9 @@
<ClCompile Include="..\src\libtess2\priorityq.c" />
<ClCompile Include="..\src\libtess2\sweep.c" />
<ClCompile Include="..\src\libtess2\tess.c" />
+ <ClCompile Include="..\src\linebreak\linebreak.c" />
+ <ClCompile Include="..\src\linebreak\linebreakdata.c" />
+ <ClCompile Include="..\src\linebreak\linebreakdef.c" />
<ClCompile Include="..\src\videoInput\videoInput.cpp" />
</ItemGroup>
<ItemGroup>
@@ -230,10 +235,13 @@
<ClInclude Include="..\include\cinder\Plane.h" />
<ClInclude Include="..\include\cinder\qtime\MovieWriter.h" />
<ClInclude Include="..\include\cinder\Function.h" />
+ <ClInclude Include="..\include\cinder\svg\Svg.h" />
+ <ClInclude Include="..\include\cinder\svg\SvgGl.h" />
<ClInclude Include="..\include\cinder\Timeline.h" />
<ClInclude Include="..\include\cinder\TimelineItem.h" />
<ClInclude Include="..\include\cinder\Triangulate.h" />
<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" />
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
@@ -82,6 +82,15 @@
<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>
+ <Filter Include="Header Files\svg">
+ <UniqueIdentifier>{93ad9a5c-9ccb-4f98-8d4c-bf21a522208f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\linebreak">
+ <UniqueIdentifier>{32843c15-443f-4fa7-ab9c-be6125f164f3}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cinder\Area.cpp">
@@ -426,6 +435,21 @@
<ClCompile Include="..\src\cinder\Json.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\src\cinder\svg\Svg.cpp">
+ <Filter>Source Files\svg</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\linebreak\linebreak.c">
+ <Filter>Source Files\linebreak</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\linebreak\linebreakdata.c">
+ <Filter>Source Files\linebreak</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\linebreak\linebreakdef.c">
+ <Filter>Source Files\linebreak</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\cinder\Unicode.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\AntTweakBar\AntPerfTimer.h">
@@ -893,6 +917,15 @@
<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>
+ <ClInclude Include="..\include\cinder\svg\SvgGl.h">
+ <Filter>Header Files\svg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\cinder\Unicode.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\src\jsoncpp\json_internalarray.inl">

0 comments on commit 438d863

Please sign in to comment.