Fixed compilation problems with release builds in VC++ 2k5. All plugi…

…ns now compile without error when "Release" is the build target.
skyjake · Apr 29, 2007 · dd0494f · dd0494f
1 parent ce7d997
commit dd0494f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 32 deletions.
diff --git a/doomsday/build/win32/vs8/dpdehread.vcproj b/doomsday/build/win32/vs8/dpdehread.vcproj
@@ -59,7 +59,7 @@
 				ProgramDataBaseFileName=".\./Obj/Release/dpDehRead/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CallingConvention="2"
+				CallingConvention="0"
 				CompileAs="0"
 			/>
 			<Tool
@@ -76,7 +76,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./Bin/Release/Doomsday.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="./Bin/Release/Doomsday.lib"
 				OutputFile=".\./Bin/Release/dpDehRead.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

diff --git a/doomsday/build/win32/vs8/dpmapload.vcproj b/doomsday/build/win32/vs8/dpmapload.vcproj
@@ -42,21 +42,21 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName="./Bin/Release/dpMapLoad.tlb"
+				TypeLibraryName=".\./Bin/Release/dpMapLoad.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\external\zlib\portable\include;..\..\..\engine\api;..\..\..\external\glbsp\include"
-				PreprocessorDefinitions="GLBSP_PLUGIN;WIN32;NDEBUG;_WINDOWS;_USRDLL;DPDEHREAD_EXPORTS"
+				PreprocessorDefinitions="GLBSP_PLUGIN;WIN32;NDEBUG;_WINDOWS;_USRDLL;DPMAPLOAD_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="./Obj/Release/dpMapLoad/dpMapLoad.pch"
-				AssemblerListingLocation="./Obj/Release/dpMapLoad/"
-				ObjectFile="./Obj/Release/dpMapLoad/"
-				ProgramDataBaseFileName="./Obj/Release/dpMapLoad/"
+				PrecompiledHeaderFile=".\./Obj/Release/dpMapLoad/dpMapLoad.pch"
+				AssemblerListingLocation=".\./Obj/Release/dpMapLoad/"
+				ObjectFile=".\./Obj/Release/dpMapLoad/"
+				ProgramDataBaseFileName=".\./Obj/Release/dpMapLoad/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CallingConvention="0"
@@ -76,12 +76,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./bin/release/doomsday.lib"
-				OutputFile="./Bin/Release/dpMapLoad.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="./bin/release/Doomsday.lib"
+				OutputFile=".\./Bin/Release/dpMapLoad.dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile="./Bin/Release/dpMapLoad.pdb"
-				ImportLibrary="./Bin/Release/dpMapLoad.lib"
+				ProgramDatabaseFile=".\./Bin/Release/dpMapLoad.pdb"
+				ImportLibrary=".\./Bin/Release/dpMapLoad.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -214,14 +214,6 @@
 			<File
 				RelativePath="..\..\..\plugins\mapload\src\maploader.c"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CallingConvention="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<Filter
 				Name="glBSP"

diff --git a/doomsday/build/win32/vs8/drd3d.vcproj b/doomsday/build/win32/vs8/drd3d.vcproj
@@ -172,8 +172,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./bin/release/doomsday.lib d3d8.lib d3dx8.lib"
-				OutputFile=".\./Bin/Release/drD3D.dll"
+				AdditionalDependencies="./bin/release/doomsday.lib d3d9.lib d3dx9.lib dxerr9.lib user32.lib gdi32.lib ole32.lib uuid.lib advapi32.lib"
+				OutputFile=".\Bin/Release/drD3D.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile="..\..\..\plugins\d3d\api\drd3d.def"

diff --git a/doomsday/build/win32/vs8/dropengl.vcproj b/doomsday/build/win32/vs8/dropengl.vcproj
@@ -266,7 +266,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./bin/release/doomsday.lib opengl32.lib glu32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="./bin/release/doomsday.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib"
 				OutputFile=".\./Bin/Release/drOpenGL.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

diff --git a/doomsday/build/win32/vs8/dscompat.vcproj b/doomsday/build/win32/vs8/dscompat.vcproj
@@ -155,7 +155,7 @@
 				ProgramDataBaseFileName=".\./Obj/Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CallingConvention="2"
+				CallingConvention="0"
 				CompileAs="0"
 			/>
 			<Tool
@@ -172,7 +172,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="eax.lib eaxguid.lib dsound.lib dxguid.lib ./bin/release/doomsday.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="eax.lib eaxguid.lib dsound.lib dxguid.lib ./bin/release/doomsday.lib"
 				OutputFile=".\./Bin/Release/dsCompat.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

diff --git a/doomsday/build/win32/vs8/dsopenal.vcproj b/doomsday/build/win32/vs8/dsopenal.vcproj
@@ -46,6 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\engine\api;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSOPENAL_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -73,11 +74,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./bin/release/doomsday.lib alut.lib openal32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="./bin/release/doomsday.lib openal32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\./Bin/Release/dsOpenAL.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\Src\dsOpenAL\dsOpenAL.def"
+				ModuleDefinitionFile="..\..\..\plugins\openal\api\dsopenal.def"
 				ProgramDatabaseFile=".\./Bin/Release/dsOpenAL.pdb"
 				ImportLibrary=".\./Bin/Release/dsOpenAL.lib"
 			/>

diff --git a/doomsday/build/win32/vs8/dssdlmixer.vcproj b/doomsday/build/win32/vs8/dssdlmixer.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="dsSDLMixer"
 	ProjectGUID="{C9C45D56-D51C-45C7-8509-020DE447638B}"
 	RootNamespace="dsSDLMixer"
@@ -76,12 +76,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="./Bin/Release/Doomsday.lib odbc32.lib odbccp32.lib"
-				OutputFile="./Bin/Release/dpMapLoad.dll"
+				AdditionalDependencies="./Bin/Release/Doomsday.lib sdl_mixer.lib sdl.lib"
+				OutputFile="./Bin/Release/dsSDLMixer.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				ModuleDefinitionFile="..\..\..\plugins\sdlmixer\api\dssdlmixer.def"
 				ProgramDatabaseFile="./Bin/Release/dpMapLoad.pdb"
-				ImportLibrary="./Bin/Release/dpMapLoad.lib"
+				ImportLibrary="./Bin/Release/dsSDLMixer.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"