From 0af6d3fcef7d02bdbc1260e674a1ee385d7d4a1d Mon Sep 17 00:00:00 2001 From: Buginator Date: Sun, 17 Apr 2011 15:42:14 -0400 Subject: [PATCH] Fix VS2k10 files for Qt --- lib/framework/framework.vcxproj | 4 +- lib/framework/framework.vcxproj.filters | 6 -- lib/ivis_opengl/glew/glew.vcxproj | 81 +++++++++++++++++++++ lib/ivis_opengl/glew/glew.vcxproj.filters | 22 ++++++ lib/ivis_opengl/ivis_opengl.vcxproj | 3 +- lib/ivis_opengl/ivis_opengl.vcxproj.filters | 3 - src/Warzone2100.vcxproj | 19 +++-- src/Warzone2100.vcxproj.filters | 12 +++ win32/Warzone2100.sln | 26 +++---- 9 files changed, 138 insertions(+), 38 deletions(-) create mode 100644 lib/ivis_opengl/glew/glew.vcxproj create mode 100644 lib/ivis_opengl/glew/glew.vcxproj.filters diff --git a/lib/framework/framework.vcxproj b/lib/framework/framework.vcxproj index d26103947..a988422a0 100644 --- a/lib/framework/framework.vcxproj +++ b/lib/framework/framework.vcxproj @@ -70,7 +70,7 @@ Disabled $(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;YY_STATIC;LOCALEDIR="";%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;YY_STATIC;LOCALEDIR="";GLEW_STATIC;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -150,7 +150,6 @@ - @@ -198,7 +197,6 @@ - diff --git a/lib/framework/framework.vcxproj.filters b/lib/framework/framework.vcxproj.filters index 2cbad74e2..cac365ac5 100644 --- a/lib/framework/framework.vcxproj.filters +++ b/lib/framework/framework.vcxproj.filters @@ -65,9 +65,6 @@ Source Files - - Source Files - Source Files @@ -179,9 +176,6 @@ Header Files - - Header Files - Header Files diff --git a/lib/ivis_opengl/glew/glew.vcxproj b/lib/ivis_opengl/glew/glew.vcxproj new file mode 100644 index 000000000..ed3706321 --- /dev/null +++ b/lib/ivis_opengl/glew/glew.vcxproj @@ -0,0 +1,81 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + {EAE17819-8C98-4AAE-9569-BD04160D9711} + Win32Proj + glew + + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + ..\..\..\devpkg\include;$(Qtdir)\include;$(IncludePath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;GLEW_STATIC;%(PreprocessorDefinitions) + ProgramDatabase + StreamingSIMDExtensions2 + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/lib/ivis_opengl/glew/glew.vcxproj.filters b/lib/ivis_opengl/glew/glew.vcxproj.filters new file mode 100644 index 000000000..4eb761fbc --- /dev/null +++ b/lib/ivis_opengl/glew/glew.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/lib/ivis_opengl/ivis_opengl.vcxproj b/lib/ivis_opengl/ivis_opengl.vcxproj index f17bf3d1d..65370ce02 100644 --- a/lib/ivis_opengl/ivis_opengl.vcxproj +++ b/lib/ivis_opengl/ivis_opengl.vcxproj @@ -62,7 +62,7 @@ Disabled $(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;$(SolutionDir)\..\lib\ivis_opengl;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;GLEW_STATIC;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -122,7 +122,6 @@ - diff --git a/lib/ivis_opengl/ivis_opengl.vcxproj.filters b/lib/ivis_opengl/ivis_opengl.vcxproj.filters index 0d2b5b52d..8760e0f34 100644 --- a/lib/ivis_opengl/ivis_opengl.vcxproj.filters +++ b/lib/ivis_opengl/ivis_opengl.vcxproj.filters @@ -67,9 +67,6 @@ - - Header Files - Header Files diff --git a/src/Warzone2100.vcxproj b/src/Warzone2100.vcxproj index f280dc805..17f85a685 100644 --- a/src/Warzone2100.vcxproj +++ b/src/Warzone2100.vcxproj @@ -95,7 +95,7 @@ Disabled $(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;$(SolutionDir)\..\lib\ivis_opengl;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;LOCALEDIR="";YY_NO_UNISTD_H;YY_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;LOCALEDIR="";YY_NO_UNISTD_H;YY_STATIC;NOMINMAX;GLEW_STATIC;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -107,7 +107,7 @@ true - zlibstat.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;glc32.lib;OpenGL32.lib;GLU32.lib;shfolder.lib;winmm.lib;ws2_32.lib;dbghelp.lib;physfs.lib;libtheora_static.lib;libpng15.lib;QtGui4.lib;QtOpenGL4.lib;QtCore4.lib;QtMain.lib;%(AdditionalDependencies) + zlibstat.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;glc32.lib;OpenGL32.lib;GLU32.lib;shfolder.lib;winmm.lib;ws2_32.lib;dbghelp.lib;physfs.lib;libtheora_static.lib;libpng15.lib;QtGui4.lib;QtOpenGL4.lib;QtCore4.lib;QtMain.lib;QtScript4.lib;QtScriptTools4.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName)-Dbg.exe $(SolutionDir)\..\devpkg\lib;%(AdditionalLibraryDirectories) MSVCRT.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -296,6 +296,8 @@ + + @@ -422,6 +424,8 @@ + + @@ -474,12 +478,13 @@ {efe011b6-4c0b-40aa-9f18-5ad599e70d28} false - - {0a5a8b49-7072-4196-aa26-dd767760c6b5} + + {eae17819-8c98-4aae-9569-bd04160d9711} + true false - - - {5cb20cc1-8e23-499d-a584-05cebabf85fc} + false + true + false {4d637147-73f9-4a51-944b-34bf78e6c6dc} diff --git a/src/Warzone2100.vcxproj.filters b/src/Warzone2100.vcxproj.filters index 28e2efd05..8bc583bbe 100644 --- a/src/Warzone2100.vcxproj.filters +++ b/src/Warzone2100.vcxproj.filters @@ -345,6 +345,12 @@ Source Files + + Source Files + + + Source Files + @@ -725,6 +731,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/win32/Warzone2100.sln b/win32/Warzone2100.sln index da899a1b3..c595dc197 100644 --- a/win32/Warzone2100.sln +++ b/win32/Warzone2100.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Warzone2100", "..\src\Warzone2100.vcxproj", "{BDDCCB7B-F4F7-4768-A1C3-AE20E9F5FDFC}" ProjectSection(ProjectDependencies) = postProject - {5CB20CC1-8E23-499D-A584-05CEBABF85FC} = {5CB20CC1-8E23-499D-A584-05CEBABF85FC} + {EAE17819-8C98-4AAE-9569-BD04160D9711} = {EAE17819-8C98-4AAE-9569-BD04160D9711} {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18} = {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18} EndProjectSection EndProject @@ -18,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netplay", "..\lib\netplay\n EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivis_opengl", "..\lib\ivis_opengl\ivis_opengl.vcxproj", "{4D637147-73F9-4A51-944B-34BF78E6C6DC}" ProjectSection(ProjectDependencies) = postProject - {5CB20CC1-8E23-499D-A584-05CEBABF85FC} = {5CB20CC1-8E23-499D-A584-05CEBABF85FC} + {EAE17819-8C98-4AAE-9569-BD04160D9711} = {EAE17819-8C98-4AAE-9569-BD04160D9711} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamelib", "..\lib\gamelib\gamelib.vcxproj", "{EFE011B6-4C0B-40AA-9F18-5AD599E70D28}" @@ -27,9 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "..\lib\framewo EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exceptionhandler", "..\lib\exceptionhandler\exceptionhandler.vcxproj", "{9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iniparser", "..\lib\iniparser\iniparser.vcxproj", "{0A5A8B49-7072-4196-AA26-DD767760C6B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glee", "..\lib\ivis_opengl\glee\glee.vcxproj", "{5CB20CC1-8E23-499D-A584-05CEBABF85FC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "..\lib\ivis_opengl\glew\glew.vcxproj", "{EAE17819-8C98-4AAE-9569-BD04160D9711}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -98,18 +96,12 @@ Global {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18}.Debug|Win32.Build.0 = Debug|Win32 {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18}.Release|Win32.ActiveCfg = Release|Win32 {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18}.Release|Win32.Build.0 = Release|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.(STLport)-Debug|Win32.ActiveCfg = STLport-Debug|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.(STLport)-Debug|Win32.Build.0 = STLport-Debug|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.Debug|Win32.Build.0 = Debug|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.Release|Win32.ActiveCfg = Release|Win32 - {0A5A8B49-7072-4196-AA26-DD767760C6B5}.Release|Win32.Build.0 = Release|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.(STLport)-Debug|Win32.ActiveCfg = STLport-Debug|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.(STLport)-Debug|Win32.Build.0 = STLport-Debug|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.Debug|Win32.Build.0 = Debug|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.Release|Win32.ActiveCfg = Release|Win32 - {5CB20CC1-8E23-499D-A584-05CEBABF85FC}.Release|Win32.Build.0 = Release|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.(STLport)-Debug|Win32.ActiveCfg = Debug|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.(STLport)-Debug|Win32.Build.0 = Debug|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.Debug|Win32.ActiveCfg = Debug|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.Debug|Win32.Build.0 = Debug|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.Release|Win32.ActiveCfg = Release|Win32 + {EAE17819-8C98-4AAE-9569-BD04160D9711}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE