goat3d

changeset 89:c1871707c678

fixed the windows build
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 16 May 2014 05:23:10 +0300
parents 7941e89798e5
children 8b156bc5205b
files goatview/goatview.vcxproj goatview/goatview.vcxproj.filters goatview/src/opengl.h
diffstat 3 files changed, 23 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/goatview/goatview.vcxproj	Thu May 15 06:52:01 2014 +0300
     1.2 +++ b/goatview/goatview.vcxproj	Fri May 16 05:23:10 2014 +0300
     1.3 @@ -99,11 +99,12 @@
     1.4        <Optimization>Disabled</Optimization>
     1.5        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     1.6        <AdditionalIncludeDirectories>$(SolutionDir)\src</AdditionalIncludeDirectories>
     1.7 +      <DisableSpecificWarnings>4305</DisableSpecificWarnings>
     1.8      </ClCompile>
     1.9      <Link>
    1.10        <SubSystem>Console</SubSystem>
    1.11        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.12 -      <AdditionalDependencies>goat3d-x64.lib;qtmaind.lib;Qt5Guid.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;libvmath-x64-dbg.lib;libanim-x64-dbg.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.13 +      <AdditionalDependencies>goat3d-x64.lib;qtmaind.lib;Qt5Guid.lib;Qt5Cored.lib;Qt5Widgetsd.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;glew32-x64.lib;libvmath-x64-dbg.lib;libanim-x64-dbg.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.14        <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    1.15      </Link>
    1.16      <CustomBuildStep>
    1.17 @@ -150,13 +151,14 @@
    1.18        <IntrinsicFunctions>true</IntrinsicFunctions>
    1.19        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.20        <AdditionalIncludeDirectories>$(SolutionDir)\src</AdditionalIncludeDirectories>
    1.21 +      <DisableSpecificWarnings>4305</DisableSpecificWarnings>
    1.22      </ClCompile>
    1.23      <Link>
    1.24        <SubSystem>Console</SubSystem>
    1.25        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.26        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    1.27        <OptimizeReferences>true</OptimizeReferences>
    1.28 -      <AdditionalDependencies>goat3d-x64.lib;qtmain.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;libvmath-x64.lib;libanim-x64.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.29 +      <AdditionalDependencies>goat3d-x64.lib;qtmain.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;glew32-x64.lib;libvmath-x64.lib;libanim-x64.lib;pthreadVC2_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.30        <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
    1.31      </Link>
    1.32    </ItemDefinitionGroup>
    1.33 @@ -164,7 +166,9 @@
    1.34      <ClCompile Include="src\goatview.cc" />
    1.35      <ClCompile Include="src\main.cc" />
    1.36      <ClCompile Include="src\moc_goatview.cc" />
    1.37 +	 <ClCompile Include="src\moc_scenemodel.cc" />
    1.38      <ClCompile Include="src\opengl.c" />
    1.39 +    <ClCompile Include="src\scenemodel.cc" />
    1.40    </ItemGroup>
    1.41    <!--ItemGroup>
    1.42      <ClInclude Include="src\goatview.h" />
    1.43 @@ -178,6 +182,11 @@
    1.44        <Command>moc.exe src\goatview.h -o src\moc_goatview.cc</Command>
    1.45        <Outputs>src\moc_goatview.cc</Outputs>
    1.46      </CustomBuild>
    1.47 +    <CustomBuild Include="src\scenemodel.h">
    1.48 +      <Message>Running MOC on src\scenemodel.h ...</Message>
    1.49 +      <Command>moc.exe src\scenemodel.h -o src\moc_scenemodel.cc</Command>
    1.50 +      <Outputs>src\moc_scenemodel.cc</Outputs>
    1.51 +    </CustomBuild>
    1.52    </ItemGroup>
    1.53    <ItemGroup>
    1.54      <ClInclude Include="src\opengl.h" />
    1.55 @@ -186,4 +195,4 @@
    1.56      <CustomBuildAfterTargets>ClCompile</CustomBuildAfterTargets>
    1.57      <CustomBuildBeforeTargets>Link</CustomBuildBeforeTargets>
    1.58    </PropertyGroup>
    1.59 -</Project>
    1.60 \ No newline at end of file
    1.61 +</Project>
     2.1 --- a/goatview/goatview.vcxproj.filters	Thu May 15 06:52:01 2014 +0300
     2.2 +++ b/goatview/goatview.vcxproj.filters	Fri May 16 05:23:10 2014 +0300
     2.3 @@ -30,11 +30,20 @@
     2.4      <ClCompile Include="src\opengl.c">
     2.5        <Filter>Source Files</Filter>
     2.6      </ClCompile>
     2.7 +    <ClCompile Include="src\scenemodel.cc">
     2.8 +      <Filter>Source Files</Filter>
     2.9 +    </ClCompile>
    2.10 +    <ClCompile Include="src\moc_scenemodel.cc">
    2.11 +      <Filter>moc</Filter>
    2.12 +    </ClCompile>
    2.13    </ItemGroup>
    2.14    <ItemGroup>
    2.15      <CustomBuild Include="src\goatview.h">
    2.16        <Filter>Header Files</Filter>
    2.17      </CustomBuild>
    2.18 +    <CustomBuild Include="src\scenemodel.h">
    2.19 +      <Filter>Header Files</Filter>
    2.20 +    </CustomBuild>
    2.21    </ItemGroup>
    2.22    <ItemGroup>
    2.23      <ClInclude Include="src\opengl.h">
     3.1 --- a/goatview/src/opengl.h	Thu May 15 06:52:01 2014 +0300
     3.2 +++ b/goatview/src/opengl.h	Fri May 16 05:23:10 2014 +0300
     3.3 @@ -5,7 +5,9 @@
     3.4  #define QT_NO_OPENGL_ES_2
     3.5  
     3.6  #ifdef WIN32
     3.7 +#define WIN32_LEAN_AND_MEAN 1
     3.8  #include <windows.h>
     3.9 +#undef min
    3.10  #endif
    3.11  
    3.12  #ifdef __APPLE__