Fix VS2k10 files for Qt

master
Buginator 2011-04-17 15:42:14 -04:00
parent de63d0b4ac
commit 0af6d3fcef
9 changed files with 138 additions and 38 deletions

View File

@ -70,7 +70,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;YY_STATIC;LOCALEDIR="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -150,7 +150,6 @@
<ClCompile Include="strres.cpp" />
<ClCompile Include="strres_lexer.lex.cpp" />
<ClCompile Include="strres_parser.tab.cpp" />
<ClCompile Include="tagfile.cpp" />
<ClCompile Include="treap.cpp" />
<ClCompile Include="trig.cpp" />
<ClCompile Include="utf.cpp" />
@ -198,7 +197,6 @@
<ClInclude Include="strres.h" />
<ClInclude Include="strresly.h" />
<ClInclude Include="strres_parser.tab.hpp" />
<ClInclude Include="tagfile.h" />
<ClInclude Include="treap.h" />
<ClInclude Include="trig.h" />
<ClInclude Include="types.h" />

View File

@ -65,9 +65,6 @@
<ClCompile Include="strres_parser.tab.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="tagfile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="treap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -179,9 +176,6 @@
<ClInclude Include="strresly.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="tagfile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="treap.h">
<Filter>Header Files</Filter>
</ClInclude>

View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\devpkg\glew.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{EAE17819-8C98-4AAE-9569-BD04160D9711}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>glew</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>..\..\..\devpkg\include;$(Qtdir)\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\devpkg\glew.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -62,7 +62,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;$(SolutionDir)\..\lib\ivis_opengl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -122,7 +122,6 @@
<ClCompile Include="textdraw.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="GLee.h" />
<ClInclude Include="imd.h" />
<ClInclude Include="ivi.h" />
<ClInclude Include="ivisdef.h" />

View File

@ -67,9 +67,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="GLee.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="piematrix.h">
<Filter>Header Files</Filter>
</ClInclude>

View File

@ -95,7 +95,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)\..;$(SolutionDir)\..\devpkg\include;$(SolutionDir)\..\devpkg\include\SDL;$(SolutionDir)\..\lib\ivis_opengl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -107,7 +107,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;%(AdditionalDependencies)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName)-Dbg.exe</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\..\devpkg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>MSVCRT.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -296,6 +296,8 @@
<ClCompile Include="pointtree.cpp" />
<ClCompile Include="power.cpp" />
<ClCompile Include="projectile.cpp" />
<ClCompile Include="qtscript.cpp" />
<ClCompile Include="qtscriptfuncs.cpp" />
<ClCompile Include="radar.cpp" />
<ClCompile Include="random.cpp" />
<ClCompile Include="raycast.cpp" />
@ -422,6 +424,8 @@
<ClInclude Include="power.h" />
<ClInclude Include="projectile.h" />
<ClInclude Include="projectiledef.h" />
<ClInclude Include="qtscript.h" />
<ClInclude Include="qtscriptfuncs.h" />
<ClInclude Include="radar.h" />
<ClInclude Include="raycast.h" />
<ClInclude Include="research.h" />
@ -474,12 +478,13 @@
<Project>{efe011b6-4c0b-40aa-9f18-5ad599e70d28}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\lib\iniparser\iniparser.vcxproj">
<Project>{0a5a8b49-7072-4196-aa26-dd767760c6b5}</Project>
<ProjectReference Include="..\lib\ivis_opengl\glew\glew.vcxproj">
<Project>{eae17819-8c98-4aae-9569-bd04160d9711}</Project>
<Private>true</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\lib\ivis_opengl\glee\glee.vcxproj">
<Project>{5cb20cc1-8e23-499d-a584-05cebabf85fc}</Project>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\lib\ivis_opengl\ivis_opengl.vcxproj">
<Project>{4d637147-73f9-4a51-944b-34bf78e6c6dc}</Project>

View File

@ -345,6 +345,12 @@
<ClCompile Include="wrappers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="qtscript.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="qtscriptfuncs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="action.h">
@ -725,6 +731,12 @@
<ClInclude Include="wrappers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="qtscript.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="qtscriptfuncs.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<FlexGenerator Include="level_lexer.l">

View File

@ -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