[quake3-commits] r2013 - in trunk: code/jpeg-8c misc/msvc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jun 6 17:15:42 EDT 2011
Author: thilo
Date: 2011-06-06 17:15:42 -0400 (Mon, 06 Jun 2011)
New Revision: 2013
Modified:
trunk/code/jpeg-8c/jconfig.h
trunk/misc/msvc/cgame.vcproj
trunk/misc/msvc/game.vcproj
trunk/misc/msvc/ioq3.sln
trunk/misc/msvc/q3_ui.vcproj
trunk/misc/msvc/quake3.vcproj
trunk/misc/msvc/ui.vcproj
Log:
- Adapt MSVC project files to new libjpeg, fix by Guillaume Bougard and cyrri
- add tr_model_iqm.c to MSVC project, by cyrri
Modified: trunk/code/jpeg-8c/jconfig.h
===================================================================
--- trunk/code/jpeg-8c/jconfig.h 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/code/jpeg-8c/jconfig.h 2011-06-06 21:15:42 UTC (rev 2013)
@@ -31,7 +31,11 @@
#endif
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
+#ifdef _MSC_VER
+#define INLINE __inline
+#else
#define INLINE __inline__
+#endif
/* These are for configuring the JPEG memory manager. */
/* #undef DEFAULT_MAX_MEM */
/* #undef NO_MKTEMP */
Modified: trunk/misc/msvc/cgame.vcproj
===================================================================
--- trunk/misc/msvc/cgame.vcproj 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/cgame.vcproj 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9,00"
Name="cgame"
ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
RootNamespace="cgame"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -83,6 +84,8 @@
MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2"
BaseAddress="0x30000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1"
/>
@@ -105,9 +108,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -180,6 +180,8 @@
MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2"
BaseAddress="0x30000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1"
/>
@@ -202,9 +204,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -277,6 +276,8 @@
MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2"
BaseAddress="0x30000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1"
/>
@@ -299,9 +300,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -374,6 +372,8 @@
MapFileName="$(IntDir)\cgamex86.map"
SubSystem="2"
BaseAddress="0x30000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\cgamex86.lib"
TargetMachine="1"
/>
@@ -396,9 +396,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/misc/msvc/game.vcproj
===================================================================
--- trunk/misc/msvc/game.vcproj 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/game.vcproj 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9,00"
Name="game"
ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -82,6 +83,8 @@
MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2"
BaseAddress="0x20000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1"
/>
@@ -104,9 +107,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -179,6 +179,8 @@
MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2"
BaseAddress="0x20000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1"
/>
@@ -201,9 +203,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -276,6 +275,8 @@
MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2"
BaseAddress="0x20000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1"
/>
@@ -298,9 +299,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -373,6 +371,8 @@
MapFileName="$(IntDir)\qagamex86.map"
SubSystem="2"
BaseAddress="0x20000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\qagamex86.lib"
TargetMachine="1"
/>
@@ -395,9 +395,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/misc/msvc/ioq3.sln
===================================================================
--- trunk/misc/msvc/ioq3.sln 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/ioq3.sln 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,61 +1,61 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug TA|Win32 = Debug TA|Win32
- Debug|Win32 = Debug|Win32
- Release TA|Win32 = Release TA|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA|Win32.Build.0 = Debug TA|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug|Win32.ActiveCfg = Debug|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug|Win32.Build.0 = Debug|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA|Win32.Build.0 = Release TA|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release|Win32.ActiveCfg = Release|Win32
- {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release|Win32.Build.0 = Release|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA|Win32.Build.0 = Debug TA|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug|Win32.ActiveCfg = Debug|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug|Win32.Build.0 = Debug|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|Win32.Build.0 = Release TA|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.ActiveCfg = Release|Win32
- {F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.Build.0 = Release|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.ActiveCfg = Debug|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.Build.0 = Debug|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.ActiveCfg = Release|Win32
- {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.Build.0 = Release|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.Build.0 = Debug TA|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|Win32.ActiveCfg = Debug|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|Win32.Build.0 = Debug|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA|Win32.Build.0 = Release TA|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release|Win32.ActiveCfg = Release|Win32
- {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release|Win32.Build.0 = Release|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.Build.0 = Debug TA|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug|Win32.ActiveCfg = Debug|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.ActiveCfg = Release TA|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.Build.0 = Release TA|Win32
- {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release|Win32.ActiveCfg = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug TA|Win32 = Debug TA|Win32
+ Debug|Win32 = Debug|Win32
+ Release TA|Win32 = Release TA|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA|Win32.Build.0 = Debug TA|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug|Win32.Build.0 = Debug|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA|Win32.ActiveCfg = Release TA|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA|Win32.Build.0 = Release TA|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release|Win32.ActiveCfg = Release|Win32
+ {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release|Win32.Build.0 = Release|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA|Win32.Build.0 = Debug TA|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug|Win32.Build.0 = Debug|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|Win32.ActiveCfg = Release TA|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA|Win32.Build.0 = Release TA|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.ActiveCfg = Release|Win32
+ {F9EE10DA-2404-4154-B904-F93C936C040A}.Release|Win32.Build.0 = Release|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug|Win32.Build.0 = Debug|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA|Win32.ActiveCfg = Release TA|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.ActiveCfg = Release|Win32
+ {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release|Win32.Build.0 = Release|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA|Win32.Build.0 = Debug TA|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug|Win32.Build.0 = Debug|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA|Win32.ActiveCfg = Release TA|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA|Win32.Build.0 = Release TA|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release|Win32.ActiveCfg = Release|Win32
+ {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release|Win32.Build.0 = Release|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA|Win32.Build.0 = Debug TA|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.ActiveCfg = Release TA|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.Build.0 = Release TA|Win32
+ {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release|Win32.ActiveCfg = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/misc/msvc/q3_ui.vcproj
===================================================================
--- trunk/misc/msvc/q3_ui.vcproj 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/q3_ui.vcproj 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9,00"
Name="q3_ui"
ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -83,6 +84,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1"
/>
@@ -105,9 +108,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -177,6 +177,8 @@
SuppressStartupBanner="true"
ModuleDefinitionFile="q3_ui.def"
ProgramDatabaseFile="$(IntDir)\uix86_old.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\q3_ui.lib"
TargetMachine="1"
/>
@@ -199,9 +201,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -271,6 +270,8 @@
SuppressStartupBanner="true"
ModuleDefinitionFile=".\q3_ui.def"
ProgramDatabaseFile="$(IntDir)\uix86.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1"
/>
@@ -293,9 +294,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -369,6 +367,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1"
/>
@@ -391,9 +391,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/misc/msvc/quake3.vcproj
===================================================================
--- trunk/misc/msvc/quake3.vcproj 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/quake3.vcproj 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9,00"
Name="quake3"
ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -46,7 +47,7 @@
Name="VCCLCompilerTool"
Optimization="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;"..\..\code\jpeg-8c""
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"
RuntimeLibrary="0"
@@ -73,7 +74,7 @@
/>
<Tool
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"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -83,6 +84,8 @@
MapFileName="$(IntDir)\quake3.map"
SubSystem="2"
StackReserveSize="8388608"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -104,9 +107,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
Description="Post build processing.."
CommandLine="rem bash -c "perl ./unix/cons -- release-TA""
@@ -144,8 +144,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\SDL12\include; ..\..\code\zlib"
- 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"
+ AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;"..\..\code\jpeg-8c""
+ 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"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@@ -173,7 +173,7 @@
/>
<Tool
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"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -184,6 +184,8 @@
MapFileName="$(IntDir)\quake3.map"
SubSystem="2"
StackReserveSize="8388608"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -205,9 +207,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
Description="Post build processing.."
CommandLine="rem bash -c "perl ./unix/cons -- debug""
@@ -246,8 +245,8 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\code\SDL12\include; ..\..\code\libcurl; ..\..\code\AL; ..\..\code\libspeex\include; ..\..\code\zlib"
- 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"
+ AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;"..\..\code\jpeg-8c""
+ 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"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -273,7 +272,7 @@
/>
<Tool
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"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -283,6 +282,8 @@
MapFileName="$(IntDir)\quake3.map"
SubSystem="2"
StackReserveSize="8388608"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -304,9 +305,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -342,7 +340,7 @@
<Tool
Name="VCCLCompilerTool"
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;"..\..\code\jpeg-8c""
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"
UsePrecompiledHeader="0"
@@ -371,7 +369,7 @@
/>
<Tool
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"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -381,6 +379,8 @@
MapFileName="$(IntDir)\quake3.map"
SubSystem="2"
StackReserveSize="8388608"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -402,9 +402,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
Description="Post build processing.."
CommandLine="rem bash -c "perl ./unix/cons -- debug-TA""
@@ -1295,6 +1292,49 @@
</FileConfiguration>
</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
RelativePath="..\..\code\qcommon\md4.c"
>
<FileConfiguration
@@ -2176,49 +2216,6 @@
</FileConfiguration>
</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
RelativePath="..\..\code\qcommon\vm.c"
>
<FileConfiguration
@@ -2489,145 +2486,189 @@
Name="Source Files"
>
<File
- RelativePath="..\..\code\jpeg-6b\jcapimin.c"
+ RelativePath="..\..\code\jpeg-8c\jaricom.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcapistd.c"
+ RelativePath="..\..\code\jpeg-8c\jcapimin.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jccoefct.c"
+ RelativePath="..\..\code\jpeg-8c\jcapistd.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jccolor.c"
+ RelativePath="..\..\code\jpeg-8c\jcarith.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcdctmgr.c"
+ RelativePath="..\..\code\jpeg-8c\jccoefct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jchuff.c"
+ RelativePath="..\..\code\jpeg-8c\jccolor.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcinit.c"
+ RelativePath="..\..\code\jpeg-8c\jcdctmgr.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcmainct.c"
+ RelativePath="..\..\code\jpeg-8c\jchuff.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcmarker.c"
+ RelativePath="..\..\code\jpeg-8c\jcinit.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcmaster.c"
+ RelativePath="..\..\code\jpeg-8c\jcmainct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcomapi.c"
+ RelativePath="..\..\code\jpeg-8c\jcmarker.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcparam.c"
+ RelativePath="..\..\code\jpeg-8c\jcmaster.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcphuff.c"
+ RelativePath="..\..\code\jpeg-8c\jcomapi.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcprepct.c"
+ RelativePath="..\..\code\jpeg-8c\jcparam.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jcsample.c"
+ RelativePath="..\..\code\jpeg-8c\jcprepct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdapimin.c"
+ RelativePath="..\..\code\jpeg-8c\jcsample.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdapistd.c"
+ RelativePath="..\..\code\jpeg-8c\jctrans.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdatasrc.c"
+ RelativePath="..\..\code\jpeg-8c\jdapimin.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdcoefct.c"
+ RelativePath="..\..\code\jpeg-8c\jdapistd.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdcolor.c"
+ RelativePath="..\..\code\jpeg-8c\jdarith.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jddctmgr.c"
+ RelativePath="..\..\code\jpeg-8c\jdatadst.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdhuff.c"
+ RelativePath="..\..\code\jpeg-8c\jdatasrc.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdinput.c"
+ RelativePath="..\..\code\jpeg-8c\jdcoefct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdmainct.c"
+ RelativePath="..\..\code\jpeg-8c\jdcolor.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdmarker.c"
+ RelativePath="..\..\code\jpeg-8c\jddctmgr.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdmaster.c"
+ RelativePath="..\..\code\jpeg-8c\jdhuff.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdpostct.c"
+ RelativePath="..\..\code\jpeg-8c\jdinput.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdsample.c"
+ RelativePath="..\..\code\jpeg-8c\jdmainct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jdtrans.c"
+ RelativePath="..\..\code\jpeg-8c\jdmarker.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jerror.c"
+ RelativePath="..\..\code\jpeg-8c\jdmaster.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jfdctflt.c"
+ RelativePath="..\..\code\jpeg-8c\jdmerge.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jidctflt.c"
+ RelativePath="..\..\code\jpeg-8c\jdpostct.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jmemmgr.c"
+ RelativePath="..\..\code\jpeg-8c\jdsample.c"
>
</File>
<File
- RelativePath="..\..\code\jpeg-6b\jmemnobs.c"
+ RelativePath="..\..\code\jpeg-8c\jdtrans.c"
>
</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>
</Filter>
<Filter
Name="Header Files"
@@ -2985,6 +3026,10 @@
>
</File>
<File
+ RelativePath="..\..\code\renderer\tr_model_iqm.c"
+ >
+ </File>
+ <File
RelativePath="..\..\code\renderer\tr_noise.c"
>
</File>
Modified: trunk/misc/msvc/ui.vcproj
===================================================================
--- trunk/misc/msvc/ui.vcproj 2011-06-06 16:55:38 UTC (rev 2012)
+++ trunk/misc/msvc/ui.vcproj 2011-06-06 21:15:42 UTC (rev 2013)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9,00"
Name="ui"
ProjectGUID="{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -82,6 +83,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1"
/>
@@ -104,9 +107,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -179,6 +179,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86_new.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86_new.lib"
TargetMachine="1"
/>
@@ -201,9 +203,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -275,6 +274,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86_new.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86_new.lib"
TargetMachine="1"
/>
@@ -297,9 +298,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -373,6 +371,8 @@
GenerateMapFile="true"
MapFileName="$(IntDir)\uix86.map"
BaseAddress="0x40000000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary="$(IntDir)\uix86.lib"
TargetMachine="1"
/>
@@ -395,9 +395,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
More information about the quake3-commits
mailing list