diff --git a/lib/framework/framework.vcxproj b/lib/framework/framework.vcxproj index a988422a0..41c1a7142 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="";GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;YY_STATIC;LOCALEDIR="";%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/lib/ivis_opengl/ivis_opengl.vcxproj b/lib/ivis_opengl/ivis_opengl.vcxproj index 65370ce02..4fa252ed8 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;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/src/Warzone2100.vcxproj b/src/Warzone2100.vcxproj index 205598f5d..63e0bc96a 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;NOMINMAX;GLEW_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;%(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;Iphlpapi.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) + zlibstat.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;glc32.lib;OpenGL32.lib;GLU32.lib;shfolder.lib;winmm.lib;Iphlpapi.lib;ws2_32.lib;dbghelp.lib;physfs.lib;glew.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) @@ -200,7 +200,7 @@ ProgramDatabase - 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;glew.lib;libtheora_static.lib;libpng15.lib;QtGui4.lib;QtOpenGL4.lib;QtCore4.lib;QtMain.lib;%(AdditionalDependencies) $(SolutionDir)\..\devpkg\lib;%(AdditionalLibraryDirectories) libcmt.lib;%(IgnoreSpecificDefaultLibraries) true @@ -478,14 +478,6 @@ {efe011b6-4c0b-40aa-9f18-5ad599e70d28} false - - {eae17819-8c98-4aae-9569-bd04160d9711} - true - false - false - true - false - {4d637147-73f9-4a51-944b-34bf78e6c6dc} false diff --git a/win32/Warzone2100.sln b/win32/Warzone2100.sln index c595dc197..f5e3ec93d 100644 --- a/win32/Warzone2100.sln +++ b/win32/Warzone2100.sln @@ -1,8 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Warzone2100", "..\src\Warzone2100.vcxproj", "{BDDCCB7B-F4F7-4768-A1C3-AE20E9F5FDFC}" ProjectSection(ProjectDependencies) = postProject - {EAE17819-8C98-4AAE-9569-BD04160D9711} = {EAE17819-8C98-4AAE-9569-BD04160D9711} {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18} = {9DC871E4-D58D-4AF6-85A6-7DF7A39B8C18} EndProjectSection EndProject @@ -17,9 +16,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netplay", "..\lib\netplay\netplay.vcxproj", "{C7698ECE-9255-4A60-8091-A9A76E8BE911}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivis_opengl", "..\lib\ivis_opengl\ivis_opengl.vcxproj", "{4D637147-73F9-4A51-944B-34BF78E6C6DC}" - ProjectSection(ProjectDependencies) = postProject - {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}" EndProject @@ -27,8 +23,6 @@ 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}") = "glew", "..\lib\ivis_opengl\glew\glew.vcxproj", "{EAE17819-8C98-4AAE-9569-BD04160D9711}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution (STLport)-Debug|Win32 = (STLport)-Debug|Win32 @@ -96,12 +90,6 @@ 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 - {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