ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-12 21:22:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Adapt MSVC project files to new libjpeg, fix by Guillaume Bougard and cyrri

Browse source 
- add tr_model_iqm.c to MSVC project, by cyrri
This commit is contained in:
Thilo Schulz 2011-06-06 21:15:42 +00:00
parent b921058a9f
commit 7a4ce592a4
7 changed files with 251 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/jpeg-8c/jconfig.h
View file

@ -31,7 +31,11 @@ typedef unsigned char boolean;
#endif #endif
/* #undef RIGHT_SHIFT_IS_UNSIGNED */ /* #undef RIGHT_SHIFT_IS_UNSIGNED */
#ifdef _MSC_VER
#define INLINE __inline
#else
#define INLINE __inline__ #define INLINE __inline__
#endif
/* These are for configuring the JPEG memory manager. */ /* These are for configuring the JPEG memory manager. */
/* #undef DEFAULT_MAX_MEM */ /* #undef DEFAULT_MAX_MEM */
/* #undef NO_MKTEMP */ /* #undef NO_MKTEMP */

23
misc/msvc/cgame.vcproj
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9,00"
Name="cgame" Name="cgame"
ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}" ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
RootNamespace="cgame" RootNamespace="cgame"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -83,6 +84,8 @@
MapFileName="$(IntDir)\cgamex86.map" MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x30000000" BaseAddress="0x30000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib" ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -104,9 +107,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -180,6 +180,8 @@
MapFileName="$(IntDir)\cgamex86.map" MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x30000000" BaseAddress="0x30000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib" ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -201,9 +203,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -277,6 +276,8 @@
MapFileName="$(IntDir)\cgamex86.map" MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x30000000" BaseAddress="0x30000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib" ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -298,9 +299,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -374,6 +372,8 @@
MapFileName="$(IntDir)\cgamex86.map" MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x30000000" BaseAddress="0x30000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib" ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -395,9 +395,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

23
misc/msvc/game.vcproj
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9,00"
Name="game" Name="game"
ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}" ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -82,6 +83,8 @@
MapFileName="$(IntDir)\qagamex86.map" MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x20000000" BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib" ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -103,9 +106,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -179,6 +179,8 @@
MapFileName="$(IntDir)\qagamex86.map" MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x20000000" BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib" ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -200,9 +202,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -276,6 +275,8 @@
MapFileName="$(IntDir)\qagamex86.map" MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x20000000" BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib" ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -297,9 +298,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -373,6 +371,8 @@
MapFileName="$(IntDir)\qagamex86.map" MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x20000000" BaseAddress="0x20000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib" ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -394,9 +394,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

4
misc/msvc/ioq3.sln
View file

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2005 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"

23
misc/msvc/q3_ui.vcproj
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9,00"
Name="q3_ui" Name="q3_ui"
ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}" ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -83,6 +84,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map" MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib" ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -104,9 +107,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -177,6 +177,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="q3_ui.def" ModuleDefinitionFile="q3_ui.def"
ProgramDatabaseFile="$(IntDir)\uix86_old.pdb" ProgramDatabaseFile="$(IntDir)\uix86_old.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\q3_ui.lib" ImportLibrary="$(IntDir)\q3_ui.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -198,9 +200,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -271,6 +270,8 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile=".\q3_ui.def" ModuleDefinitionFile=".\q3_ui.def"
ProgramDatabaseFile="$(IntDir)\uix86.pdb" ProgramDatabaseFile="$(IntDir)\uix86.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib" ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -292,9 +293,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -369,6 +367,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map" MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib" ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -390,9 +390,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />

247
misc/msvc/quake3.vcproj
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9,00"
Name="quake3" Name="quake3"
ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}" ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -46,7 +47,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\SDL12\include; ..\..\code\zlib" AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK" PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -73,7 +74,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib" AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
OutputFile="$(OutDir)\ioquake3.exe" OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@ -83,6 +84,8 @@
MapFileName="$(IntDir)\quake3.map" MapFileName="$(IntDir)\quake3.map"
SubSystem="2" SubSystem="2"
StackReserveSize="8388608" StackReserveSize="8388608"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -103,9 +106,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Post build processing.." Description="Post build processing.."
@ -144,8 +144,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\SDL12\include; ..\..\code\zlib" AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H" PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H;USE_INTERNAL_JPEG"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\quake3.pch" PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@ -173,7 +173,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib" AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
OutputFile="$(OutDir)\ioquake3.exe" OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@ -184,6 +184,8 @@
MapFileName="$(IntDir)\quake3.map" MapFileName="$(IntDir)\quake3.map"
SubSystem="2" SubSystem="2"
StackReserveSize="8388608" StackReserveSize="8388608"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -204,9 +206,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Post build processing.." Description="Post build processing.."
@ -246,8 +245,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\code\SDL12\include; ..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\zlib" AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H" PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H;USE_INTERNAL_JPEG"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -273,7 +272,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib" AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
OutputFile="$(OutDir)\ioquake3.exe" OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@ -283,6 +282,8 @@
MapFileName="$(IntDir)\quake3.map" MapFileName="$(IntDir)\quake3.map"
SubSystem="2" SubSystem="2"
StackReserveSize="8388608" StackReserveSize="8388608"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -303,9 +304,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -342,7 +340,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\SDL12\include; ..\..\code\zlib" AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK" PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -371,7 +369,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib" AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
OutputFile="$(OutDir)\ioquake3.exe" OutputFile="$(OutDir)\ioquake3.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@ -381,6 +379,8 @@
MapFileName="$(IntDir)\quake3.map" MapFileName="$(IntDir)\quake3.map"
SubSystem="2" SubSystem="2"
StackReserveSize="8388608" StackReserveSize="8388608"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -401,9 +401,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Post build processing.." Description="Post build processing.."
@ -1294,6 +1291,49 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\code\qcommon\ioapi.c"
>
<FileConfiguration
Name="Release TA|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug TA|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\code\qcommon\md4.c" RelativePath="..\..\code\qcommon\md4.c"
> >
@ -2175,49 +2215,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\code\qcommon\ioapi.c"
>
<FileConfiguration
Name="Release TA|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug TA|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\code\qcommon\vm.c" RelativePath="..\..\code\qcommon\vm.c"
> >
@ -2489,143 +2486,187 @@
Name="Source Files" Name="Source Files"
> >
<File <File
RelativePath="..\..\code\jpeg-6b\jcapimin.c" RelativePath="..\..\code\jpeg-8c\jaricom.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcapistd.c" RelativePath="..\..\code\jpeg-8c\jcapimin.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jccoefct.c" RelativePath="..\..\code\jpeg-8c\jcapistd.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jccolor.c" RelativePath="..\..\code\jpeg-8c\jcarith.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcdctmgr.c" RelativePath="..\..\code\jpeg-8c\jccoefct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jchuff.c" RelativePath="..\..\code\jpeg-8c\jccolor.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcinit.c" RelativePath="..\..\code\jpeg-8c\jcdctmgr.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcmainct.c" RelativePath="..\..\code\jpeg-8c\jchuff.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcmarker.c" RelativePath="..\..\code\jpeg-8c\jcinit.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcmaster.c" RelativePath="..\..\code\jpeg-8c\jcmainct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcomapi.c" RelativePath="..\..\code\jpeg-8c\jcmarker.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcparam.c" RelativePath="..\..\code\jpeg-8c\jcmaster.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcphuff.c" RelativePath="..\..\code\jpeg-8c\jcomapi.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcprepct.c" RelativePath="..\..\code\jpeg-8c\jcparam.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jcsample.c" RelativePath="..\..\code\jpeg-8c\jcprepct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdapimin.c" RelativePath="..\..\code\jpeg-8c\jcsample.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdapistd.c" RelativePath="..\..\code\jpeg-8c\jctrans.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdatasrc.c" RelativePath="..\..\code\jpeg-8c\jdapimin.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdcoefct.c" RelativePath="..\..\code\jpeg-8c\jdapistd.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdcolor.c" RelativePath="..\..\code\jpeg-8c\jdarith.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jddctmgr.c" RelativePath="..\..\code\jpeg-8c\jdatadst.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdhuff.c" RelativePath="..\..\code\jpeg-8c\jdatasrc.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdinput.c" RelativePath="..\..\code\jpeg-8c\jdcoefct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdmainct.c" RelativePath="..\..\code\jpeg-8c\jdcolor.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdmarker.c" RelativePath="..\..\code\jpeg-8c\jddctmgr.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdmaster.c" RelativePath="..\..\code\jpeg-8c\jdhuff.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdpostct.c" RelativePath="..\..\code\jpeg-8c\jdinput.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdsample.c" RelativePath="..\..\code\jpeg-8c\jdmainct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jdtrans.c" RelativePath="..\..\code\jpeg-8c\jdmarker.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jerror.c" RelativePath="..\..\code\jpeg-8c\jdmaster.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jfdctflt.c" RelativePath="..\..\code\jpeg-8c\jdmerge.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jidctflt.c" RelativePath="..\..\code\jpeg-8c\jdpostct.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jmemmgr.c" RelativePath="..\..\code\jpeg-8c\jdsample.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jmemnobs.c" RelativePath="..\..\code\jpeg-8c\jdtrans.c"
> >
</File> </File>
<File <File
RelativePath="..\..\code\jpeg-6b\jutils.c" RelativePath="..\..\code\jpeg-8c\jerror.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jfdctflt.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jfdctfst.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jfdctint.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jidctflt.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jidctfst.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jidctint.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jmemmgr.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jmemnobs.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jquant1.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jquant2.c"
>
</File>
<File
RelativePath="..\..\code\jpeg-8c\jutils.c"
> >
</File> </File>
</Filter> </Filter>
@ -2984,6 +3025,10 @@
RelativePath="..\..\code\renderer\tr_model.c" RelativePath="..\..\code\renderer\tr_model.c"
> >
</File> </File>
<File
RelativePath="..\..\code\renderer\tr_model_iqm.c"
>
</File>
<File <File
RelativePath="..\..\code\renderer\tr_noise.c" RelativePath="..\..\code\renderer\tr_noise.c"
> >

23
misc/msvc/ui.vcproj
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="9,00"
Name="ui" Name="ui"
ProjectGUID="{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}" ProjectGUID="{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -82,6 +83,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map" MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib" ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -103,9 +106,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -179,6 +179,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86_new.map" MapFileName="$(IntDir)\uix86_new.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86_new.lib" ImportLibrary="$(IntDir)\uix86_new.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -200,9 +202,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -275,6 +274,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86_new.map" MapFileName="$(IntDir)\uix86_new.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86_new.lib" ImportLibrary="$(IntDir)\uix86_new.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -296,9 +297,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
@ -373,6 +371,8 @@
GenerateMapFile="true" GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map" MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000" BaseAddress="0x40000000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib" ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1" TargetMachine="1"
/> />
@ -394,9 +394,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />