From 09a410314edf65932e0519d3c8393f648050e19b Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Mon, 24 Nov 2008 03:30:52 -0600
Subject: [PATCH] Fixed core/version.rc for windows, so the filename field has
 the correct engine.

Also applied fix for other builds just in case target filename ever changes.
---
 core-legacy/msvc9/mm_core-legacy.vcproj | 10 ++++++----
 core-legacy/version.rc                  |  2 +-
 core/msvc9/mm_core.vcproj               | 12 ++++++++----
 core/version.rc                         |  2 +-
 loader/msvc9/mm_loader.vcproj           |  2 ++
 loader/version.rc                       |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/core-legacy/msvc9/mm_core-legacy.vcproj b/core-legacy/msvc9/mm_core-legacy.vcproj
index 648f543..a219809 100644
--- a/core-legacy/msvc9/mm_core-legacy.vcproj
+++ b/core-legacy/msvc9/mm_core-legacy.vcproj
@@ -57,6 +57,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -142,6 +143,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -204,6 +206,10 @@
 				RelativePath="..\CSmmAPI.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\gamedll_bridge.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\oslink.cpp"
 				>
@@ -220,10 +226,6 @@
 				RelativePath="..\vsp_bridge.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\gamedll_bridge.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\vsp_listener.cpp"
 				>
diff --git a/core-legacy/version.rc b/core-legacy/version.rc
index efef7c0..4b610ae 100755
--- a/core-legacy/version.rc
+++ b/core-legacy/version.rc
@@ -48,7 +48,7 @@ BEGIN
             VALUE "FileVersion", SVN_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
-            VALUE "OriginalFilename", "metamod.1.ep1.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source"
             VALUE "ProductVersion", SVN_FULL_VERSION
         END
diff --git a/core/msvc9/mm_core.vcproj b/core/msvc9/mm_core.vcproj
index ad1e400..bb64853 100644
--- a/core/msvc9/mm_core.vcproj
+++ b/core/msvc9/mm_core.vcproj
@@ -57,6 +57,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -142,6 +143,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -224,6 +226,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -309,6 +312,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -390,6 +394,10 @@
 			<Filter
 				Name="Source Files"
 				>
+				<File
+					RelativePath="..\gamedll_bridge.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\metamod.cpp"
 					>
@@ -414,10 +422,6 @@
 					RelativePath="..\vsp_bridge.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\gamedll_bridge.cpp"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="Header Files"
diff --git a/core/version.rc b/core/version.rc
index 0f8a126..41fb316 100755
--- a/core/version.rc
+++ b/core/version.rc
@@ -48,7 +48,7 @@ BEGIN
             VALUE "FileVersion", SVN_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
-            VALUE "OriginalFilename", "metamod.2.crab.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source"
             VALUE "ProductVersion", SVN_FULL_VERSION
         END
diff --git a/loader/msvc9/mm_loader.vcproj b/loader/msvc9/mm_loader.vcproj
index 8c570d7..79df350 100644
--- a/loader/msvc9/mm_loader.vcproj
+++ b/loader/msvc9/mm_loader.vcproj
@@ -55,6 +55,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -129,6 +130,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/loader/version.rc b/loader/version.rc
index 38ff521..bc5f2c7 100644
--- a/loader/version.rc
+++ b/loader/version.rc
@@ -48,7 +48,7 @@ BEGIN
             VALUE "FileVersion", SVN_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
-            VALUE "OriginalFilename", "server.dll"
+            VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source Loader"
             VALUE "ProductVersion", SVN_FULL_VERSION
         END