goat3d

diff goat3d.vcxproj @ 27:4deb0b12fe14

wtf... corrupted heap?
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 29 Sep 2013 08:20:19 +0300
parents 6b651613bd9f
children 0fe02696fb1e
line diff
     1.1 --- a/goat3d.vcxproj	Sat Sep 28 20:36:55 2013 +0300
     1.2 +++ b/goat3d.vcxproj	Sun Sep 29 08:20:19 2013 +0300
     1.3 @@ -19,6 +19,9 @@
     1.4      </ProjectConfiguration>
     1.5    </ItemGroup>
     1.6    <ItemGroup>
     1.7 +    <ClInclude Include="libs\anim\anim.h" />
     1.8 +    <ClInclude Include="libs\anim\dynarr.h" />
     1.9 +    <ClInclude Include="libs\anim\track.h" />
    1.10      <ClInclude Include="libs\openctm\internal.h" />
    1.11      <ClInclude Include="libs\openctm\liblzma\Alloc.h" />
    1.12      <ClInclude Include="libs\openctm\liblzma\LzFind.h" />
    1.13 @@ -31,6 +34,16 @@
    1.14      <ClInclude Include="libs\openctm\openctm.h" />
    1.15      <ClInclude Include="libs\openctm\openctmpp.h" />
    1.16      <ClInclude Include="libs\tinyxml2\tinyxml2.h" />
    1.17 +    <ClInclude Include="libs\vmath\basis.h" />
    1.18 +    <ClInclude Include="libs\vmath\geom.h" />
    1.19 +    <ClInclude Include="libs\vmath\matrix.h" />
    1.20 +    <ClInclude Include="libs\vmath\quat.h" />
    1.21 +    <ClInclude Include="libs\vmath\ray.h" />
    1.22 +    <ClInclude Include="libs\vmath\sphvec.h" />
    1.23 +    <ClInclude Include="libs\vmath\vector.h" />
    1.24 +    <ClInclude Include="libs\vmath\vmath.h" />
    1.25 +    <ClInclude Include="libs\vmath\vmath_config.h" />
    1.26 +    <ClInclude Include="libs\vmath\vmath_types.h" />
    1.27      <ClInclude Include="src\camera.h" />
    1.28      <ClInclude Include="src\chunk.h" />
    1.29      <ClInclude Include="src\goat3d.h" />
    1.30 @@ -44,6 +57,9 @@
    1.31      <ClInclude Include="src\xform_node.h" />
    1.32    </ItemGroup>
    1.33    <ItemGroup>
    1.34 +    <ClCompile Include="libs\anim\anim.c" />
    1.35 +    <ClCompile Include="libs\anim\dynarr.c" />
    1.36 +    <ClCompile Include="libs\anim\track.c" />
    1.37      <ClCompile Include="libs\openctm\compressMG1.c" />
    1.38      <ClCompile Include="libs\openctm\compressMG2.c" />
    1.39      <ClCompile Include="libs\openctm\compressRAW.c" />
    1.40 @@ -55,6 +71,18 @@
    1.41      <ClCompile Include="libs\openctm\openctm.c" />
    1.42      <ClCompile Include="libs\openctm\stream.c" />
    1.43      <ClCompile Include="libs\tinyxml2\tinyxml2.cpp" />
    1.44 +    <ClCompile Include="libs\vmath\basis.cc" />
    1.45 +    <ClCompile Include="libs\vmath\basis_c.c" />
    1.46 +    <ClCompile Include="libs\vmath\geom.c" />
    1.47 +    <ClCompile Include="libs\vmath\matrix.cc" />
    1.48 +    <ClCompile Include="libs\vmath\matrix_c.c" />
    1.49 +    <ClCompile Include="libs\vmath\quat.cc" />
    1.50 +    <ClCompile Include="libs\vmath\quat_c.c" />
    1.51 +    <ClCompile Include="libs\vmath\ray.cc" />
    1.52 +    <ClCompile Include="libs\vmath\ray_c.c" />
    1.53 +    <ClCompile Include="libs\vmath\sphvec.cc" />
    1.54 +    <ClCompile Include="libs\vmath\vector.cc" />
    1.55 +    <ClCompile Include="libs\vmath\vmath.c" />
    1.56      <ClCompile Include="src\camera.cc" />
    1.57      <ClCompile Include="src\chunk.cc" />
    1.58      <ClCompile Include="src\goat3d.cc" />
    1.59 @@ -69,6 +97,13 @@
    1.60      <ClCompile Include="src\scene.cc" />
    1.61      <ClCompile Include="src\xform_node.cc" />
    1.62    </ItemGroup>
    1.63 +  <ItemGroup>
    1.64 +    <None Include="libs\vmath\matrix.inl" />
    1.65 +    <None Include="libs\vmath\quat.inl" />
    1.66 +    <None Include="libs\vmath\ray.inl" />
    1.67 +    <None Include="libs\vmath\vector.inl" />
    1.68 +    <None Include="libs\vmath\vmath.inl" />
    1.69 +  </ItemGroup>
    1.70    <PropertyGroup Label="Globals">
    1.71      <ProjectGuid>{86BF319B-9222-4805-918D-DC1B9F77BCEF}</ProjectGuid>
    1.72      <Keyword>Win32Proj</Keyword>
    1.73 @@ -84,7 +119,7 @@
    1.74    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    1.75      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.76      <UseDebugLibraries>true</UseDebugLibraries>
    1.77 -    <PlatformToolset>v110</PlatformToolset>
    1.78 +    <PlatformToolset>v100</PlatformToolset>
    1.79      <CharacterSet>Unicode</CharacterSet>
    1.80    </PropertyGroup>
    1.81    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    1.82 @@ -97,7 +132,7 @@
    1.83    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    1.84      <ConfigurationType>StaticLibrary</ConfigurationType>
    1.85      <UseDebugLibraries>false</UseDebugLibraries>
    1.86 -    <PlatformToolset>v110</PlatformToolset>
    1.87 +    <PlatformToolset>v100</PlatformToolset>
    1.88      <WholeProgramOptimization>true</WholeProgramOptimization>
    1.89      <CharacterSet>Unicode</CharacterSet>
    1.90    </PropertyGroup>
    1.91 @@ -143,14 +178,18 @@
    1.92        </PrecompiledHeader>
    1.93        <WarningLevel>Level3</WarningLevel>
    1.94        <Optimization>Disabled</Optimization>
    1.95 -      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC</PreprocessorDefinitions>
    1.96 +      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC;BUILD_MAXPLUGIN</PreprocessorDefinitions>
    1.97        <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
    1.98 -      <AdditionalIncludeDirectories>$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
    1.99 +      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
   1.100      </ClCompile>
   1.101      <Link>
   1.102        <SubSystem>Windows</SubSystem>
   1.103        <GenerateDebugInformation>true</GenerateDebugInformation>
   1.104      </Link>
   1.105 +    <Lib>
   1.106 +      <AdditionalDependencies>
   1.107 +      </AdditionalDependencies>
   1.108 +    </Lib>
   1.109    </ItemDefinitionGroup>
   1.110    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   1.111      <ClCompile>
   1.112 @@ -180,7 +219,7 @@
   1.113        <IntrinsicFunctions>true</IntrinsicFunctions>
   1.114        <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC</PreprocessorDefinitions>
   1.115        <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
   1.116 -      <AdditionalIncludeDirectories>$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
   1.117 +      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
   1.118      </ClCompile>
   1.119      <Link>
   1.120        <SubSystem>Windows</SubSystem>
   1.121 @@ -188,6 +227,10 @@
   1.122        <EnableCOMDATFolding>true</EnableCOMDATFolding>
   1.123        <OptimizeReferences>true</OptimizeReferences>
   1.124      </Link>
   1.125 +    <Lib>
   1.126 +      <AdditionalDependencies>
   1.127 +      </AdditionalDependencies>
   1.128 +    </Lib>
   1.129    </ItemDefinitionGroup>
   1.130    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   1.131    <ImportGroup Label="ExtensionTargets">