goat3d

diff goat3d.vcxproj @ 64:99715321ad6d

merged
author John Tsiombikas <nuclear@member.fsf.org>
date Thu, 17 Apr 2014 08:53:42 +0300
parents 0fe02696fb1e
children 3751aabbc5b3
line diff
     1.1 --- a/goat3d.vcxproj	Thu Apr 17 08:50:36 2014 +0300
     1.2 +++ b/goat3d.vcxproj	Thu Apr 17 08:53:42 2014 +0300
     1.3 @@ -19,9 +19,6 @@
     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 @@ -34,16 +31,6 @@
    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 @@ -57,9 +44,6 @@
    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 @@ -71,21 +55,10 @@
    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 +    <ClCompile Include="src\goat3d_read.cc" />
    1.60      <ClCompile Include="src\goat3d_readxml.cc" />
    1.61      <ClCompile Include="src\goat3d_write.cc" />
    1.62      <ClCompile Include="src\goat3d_writexml.cc" />
    1.63 @@ -97,13 +70,6 @@
    1.64      <ClCompile Include="src\scene.cc" />
    1.65      <ClCompile Include="src\xform_node.cc" />
    1.66    </ItemGroup>
    1.67 -  <ItemGroup>
    1.68 -    <None Include="libs\vmath\matrix.inl" />
    1.69 -    <None Include="libs\vmath\quat.inl" />
    1.70 -    <None Include="libs\vmath\ray.inl" />
    1.71 -    <None Include="libs\vmath\vector.inl" />
    1.72 -    <None Include="libs\vmath\vmath.inl" />
    1.73 -  </ItemGroup>
    1.74    <PropertyGroup Label="Globals">
    1.75      <ProjectGuid>{86BF319B-9222-4805-918D-DC1B9F77BCEF}</ProjectGuid>
    1.76      <Keyword>Win32Proj</Keyword>
    1.77 @@ -164,8 +130,9 @@
    1.78        </PrecompiledHeader>
    1.79        <WarningLevel>Level3</WarningLevel>
    1.80        <Optimization>Disabled</Optimization>
    1.81 -      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.82 -      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    1.83 +      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;OPENCTM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.84 +      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
    1.85 +      <AdditionalIncludeDirectories>$(ProjectDir)\libs\openctm;$(ProjectDir)\libs\openctm\liblzma;$(ProjectDir)\libs\tinyxml2</AdditionalIncludeDirectories>
    1.86      </ClCompile>
    1.87      <Link>
    1.88        <SubSystem>Windows</SubSystem>
    1.89 @@ -180,7 +147,7 @@
    1.90        <Optimization>Disabled</Optimization>
    1.91        <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC;BUILD_MAXPLUGIN</PreprocessorDefinitions>
    1.92        <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
    1.93 -      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2;$(SolutionDir)\libs\anim;$(SolutionDir)\libs\vmath</AdditionalIncludeDirectories>
    1.94 +      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
    1.95      </ClCompile>
    1.96      <Link>
    1.97        <SubSystem>Windows</SubSystem>
    1.98 @@ -199,8 +166,9 @@
    1.99        <Optimization>MaxSpeed</Optimization>
   1.100        <FunctionLevelLinking>true</FunctionLevelLinking>
   1.101        <IntrinsicFunctions>true</IntrinsicFunctions>
   1.102 -      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   1.103 -      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   1.104 +      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;OPENCTM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   1.105 +      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
   1.106 +      <AdditionalIncludeDirectories>$(ProjectDir)\libs\openctm;$(ProjectDir)\libs\openctm\liblzma;$(ProjectDir)\libs\tinyxml2</AdditionalIncludeDirectories>
   1.107      </ClCompile>
   1.108      <Link>
   1.109        <SubSystem>Windows</SubSystem>
   1.110 @@ -219,7 +187,7 @@
   1.111        <IntrinsicFunctions>true</IntrinsicFunctions>
   1.112        <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);OPENCTM_STATIC</PreprocessorDefinitions>
   1.113        <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
   1.114 -      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2;$(SolutionDir)\libs\anim;$(SolutionDir)\libs\vmath</AdditionalIncludeDirectories>
   1.115 +      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs\openctm;$(SolutionDir)\libs\openctm\liblzma;$(SolutionDir)\libs\tinyxml2</AdditionalIncludeDirectories>
   1.116      </ClCompile>
   1.117      <Link>
   1.118        <SubSystem>Windows</SubSystem>