erebus
changeset 16:d2b6cee8ea5c
fixed visual studio build
| author | John Tsiombikas <nuclear@member.fsf.org> |
|---|---|
| date | Sun, 25 May 2014 02:23:39 +0300 |
| parents | 20d6c05529f1 |
| children | e9da2916bc79 |
| files | erebus.vcxproj liberebus/liberebus.vcxproj liberebus/liberebus.vcxproj.filters liberebus/src/geomobj.cc |
| diffstat | 4 files changed, 31 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/erebus.vcxproj Sun May 25 02:00:07 2014 +0300 1.2 +++ b/erebus.vcxproj Sun May 25 02:23:39 2014 +0300 1.3 @@ -95,12 +95,13 @@ 1.4 <Optimization>Disabled</Optimization> 1.5 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 1.6 <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings> 1.7 + <AdditionalIncludeDirectories>$(SolutionDir)\liberebus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 1.8 </ClCompile> 1.9 <Link> 1.10 <SubSystem>Console</SubSystem> 1.11 <GenerateDebugInformation>true</GenerateDebugInformation> 1.12 <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;liberebus.lib;%(AdditionalDependencies)</AdditionalDependencies> 1.13 - <AdditionalLibraryDirectories>$(SolutionDir)\liberebus\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 1.14 + <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 1.15 </Link> 1.16 </ItemDefinitionGroup> 1.17 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 1.18 @@ -128,6 +129,7 @@ 1.19 <IntrinsicFunctions>true</IntrinsicFunctions> 1.20 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 1.21 <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings> 1.22 + <AdditionalIncludeDirectories>$(SolutionDir)\liberebus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 1.23 </ClCompile> 1.24 <Link> 1.25 <SubSystem>Console</SubSystem> 1.26 @@ -135,7 +137,7 @@ 1.27 <EnableCOMDATFolding>true</EnableCOMDATFolding> 1.28 <OptimizeReferences>true</OptimizeReferences> 1.29 <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;liberebus.lib;%(AdditionalDependencies)</AdditionalDependencies> 1.30 - <AdditionalLibraryDirectories>$(SolutionDir)\liberebus\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 1.31 + <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 1.32 </Link> 1.33 </ItemDefinitionGroup> 1.34 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
2.1 --- a/liberebus/liberebus.vcxproj Sun May 25 02:00:07 2014 +0300 2.2 +++ b/liberebus/liberebus.vcxproj Sun May 25 02:23:39 2014 +0300 2.3 @@ -19,7 +19,9 @@ 2.4 <ClInclude Include="src\erebus_impl.h" /> 2.5 <ClInclude Include="src\geomobj.h" /> 2.6 <ClInclude Include="src\image.h" /> 2.7 + <ClInclude Include="src\material.h" /> 2.8 <ClInclude Include="src\object.h" /> 2.9 + <ClInclude Include="src\rt.h" /> 2.10 <ClInclude Include="src\scene.h" /> 2.11 <ClInclude Include="src\snode.h" /> 2.12 <ClInclude Include="src\texture.h" /> 2.13 @@ -29,7 +31,10 @@ 2.14 <ClCompile Include="src\bvol.cc" /> 2.15 <ClCompile Include="src\camera.cc" /> 2.16 <ClCompile Include="src\erebus.cc" /> 2.17 + <ClCompile Include="src\geomobj.cc" /> 2.18 + <ClCompile Include="src\material.cc" /> 2.19 <ClCompile Include="src\object.cc" /> 2.20 + <ClCompile Include="src\rt.cc" /> 2.21 <ClCompile Include="src\scene.cc" /> 2.22 <ClCompile Include="src\snode.cc" /> 2.23 </ItemGroup> 2.24 @@ -46,14 +51,14 @@ 2.25 <ConfigurationType>StaticLibrary</ConfigurationType> 2.26 <UseDebugLibraries>true</UseDebugLibraries> 2.27 <PlatformToolset>v120</PlatformToolset> 2.28 - <CharacterSet>Unicode</CharacterSet> 2.29 + <CharacterSet>MultiByte</CharacterSet> 2.30 </PropertyGroup> 2.31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 2.32 <ConfigurationType>StaticLibrary</ConfigurationType> 2.33 <UseDebugLibraries>false</UseDebugLibraries> 2.34 <PlatformToolset>v120</PlatformToolset> 2.35 <WholeProgramOptimization>true</WholeProgramOptimization> 2.36 - <CharacterSet>Unicode</CharacterSet> 2.37 + <CharacterSet>MultiByte</CharacterSet> 2.38 </PropertyGroup> 2.39 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 2.40 <ImportGroup Label="ExtensionSettings"> 2.41 @@ -72,8 +77,8 @@ 2.42 </PrecompiledHeader> 2.43 <WarningLevel>Level3</WarningLevel> 2.44 <Optimization>Disabled</Optimization> 2.45 - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.46 - <DisableSpecificWarnings>4244</DisableSpecificWarnings> 2.47 + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.48 + <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings> 2.49 </ClCompile> 2.50 <Link> 2.51 <SubSystem>Windows</SubSystem> 2.52 @@ -88,8 +93,8 @@ 2.53 <Optimization>MaxSpeed</Optimization> 2.54 <FunctionLevelLinking>true</FunctionLevelLinking> 2.55 <IntrinsicFunctions>true</IntrinsicFunctions> 2.56 - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.57 - <DisableSpecificWarnings>4244</DisableSpecificWarnings> 2.58 + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions> 2.59 + <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings> 2.60 </ClCompile> 2.61 <Link> 2.62 <SubSystem>Windows</SubSystem>
3.1 --- a/liberebus/liberebus.vcxproj.filters Sun May 25 02:00:07 2014 +0300 3.2 +++ b/liberebus/liberebus.vcxproj.filters Sun May 25 02:23:39 2014 +0300 3.3 @@ -51,6 +51,12 @@ 3.4 <ClInclude Include="src\erebus_impl.h"> 3.5 <Filter>Header Files</Filter> 3.6 </ClInclude> 3.7 + <ClInclude Include="src\material.h"> 3.8 + <Filter>Header Files</Filter> 3.9 + </ClInclude> 3.10 + <ClInclude Include="src\rt.h"> 3.11 + <Filter>Header Files</Filter> 3.12 + </ClInclude> 3.13 </ItemGroup> 3.14 <ItemGroup> 3.15 <ClCompile Include="src\erebus.cc"> 3.16 @@ -74,6 +80,15 @@ 3.17 <ClCompile Include="src\snode.cc"> 3.18 <Filter>Source Files</Filter> 3.19 </ClCompile> 3.20 + <ClCompile Include="src\geomobj.cc"> 3.21 + <Filter>Source Files</Filter> 3.22 + </ClCompile> 3.23 + <ClCompile Include="src\material.cc"> 3.24 + <Filter>Source Files</Filter> 3.25 + </ClCompile> 3.26 + <ClCompile Include="src\rt.cc"> 3.27 + <Filter>Source Files</Filter> 3.28 + </ClCompile> 3.29 </ItemGroup> 3.30 <ItemGroup> 3.31 <None Include="src\image.inl">