1.0.00.015b

fix resource (.rc2) so 64-bit version has distinct name in file properties
victimofleisure · Feb 16, 2016 · 5ddc09f · 5ddc09f
1 parent 205f2bf
commit 5ddc09f
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 50 deletions.
diff --git a/TripLight.vcproj b/TripLight.vcproj
@@ -155,7 +155,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;_WIN64"
 				Culture="1033"
 			/>
 			<Tool
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG;_WIN64"
 				Culture="1033"
 			/>
 			<Tool
@@ -421,7 +421,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;PORTABLE_APP"
 				Culture="1033"
 			/>
 			<Tool
@@ -509,7 +509,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG;_WIN64;PORTABLE_APP"
 				Culture="1033"
 			/>
 			<Tool

diff --git a/TripLightFF/TripLightFF.rc b/TripLightFF/TripLightFF.rc
@@ -34,57 +34,16 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include ""afxres.h""\r\0"
 END
 
 3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
-    "\0"
+    "#include ""TripLightFF.rc2""  // non-Microsoft Visual C++ edited resources\r\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,15
- PRODUCTVERSION 1,0,0,15
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Anal Software"
-            VALUE "FileDescription", "TripLight Freeframe GL Plugin (VS2008 SSE2)"
-            VALUE "FileVersion", "1, 0, 0, 15"
-            VALUE "InternalName", "TripLightFF"
-            VALUE "LegalCopyright", "Copyleft 2016 Chris Korda (GPL V3)"
-            VALUE "OriginalFilename", "TripLightFF.dll"
-            VALUE "ProductName", "TripLightFF"
-            VALUE "ProductVersion", "1, 0, 0, 15"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -95,7 +54,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "TripLightFF.rc2"  // non-Microsoft Visual C++ edited resources
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

diff --git a/TripLightFF/TripLightFF.rc2 b/TripLightFF/TripLightFF.rc2
@@ -0,0 +1,69 @@
+//
+// TRIPLIGHTFF.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#define STRINGIFY(x) #x
+#define VERSION_STRING(a, b, c, d) STRINGIFY(a) "." STRINGIFY(b) "." STRINGIFY(c) "." STRINGIFY(d)
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+//	DON'T FORGET TO CHANGE VERSION.H
+//
+#define MAJOR_VERSION		1
+#define MINOR_VERSION		0
+#define MAJOR_SUBVERSION	0
+#define MINOR_SUBVERSION	15
+
+/////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MAJOR_VERSION, MINOR_VERSION, MAJOR_SUBVERSION, MINOR_SUBVERSION
+ PRODUCTVERSION MAJOR_VERSION, MINOR_VERSION, MAJOR_SUBVERSION, MINOR_SUBVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "GNU GPL v2.0\0"
+            VALUE "CompanyName", "Anal Software\0"
+#ifdef _WIN64
+            VALUE "FileDescription", "TripLight Freeframe GL Plugin (x64)\0"
+#else
+            VALUE "FileDescription", "TripLight Freeframe GL Plugin (VS2008 SSE2)\0"
+#endif
+            VALUE "FileVersion", VERSION_STRING(MAJOR_VERSION, MINOR_VERSION, MAJOR_SUBVERSION, MINOR_SUBVERSION)
+            VALUE "InternalName", "TripLightFF\0"
+            VALUE "LegalCopyright", "Copyleft 2016 Chris Korda\0"
+            VALUE "OriginalFilename", "TripLightFF.DLL\0"
+#ifdef _WIN64
+            VALUE "ProductName", "TripLightFF (x64)\0"
+#else
+            VALUE "ProductName", "TripLightFF\0"
+#endif
+            VALUE "ProductVersion", VERSION_STRING(MAJOR_VERSION, MINOR_VERSION, MAJOR_SUBVERSION, MINOR_SUBVERSION)
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TripLightFF/TripLightFF.sln b/TripLightFF/TripLightFF.sln
@@ -5,13 +5,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Debug|Win32.Build.0 = Debug|Win32
+		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Debug|x64.ActiveCfg = Debug|x64
+		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Debug|x64.Build.0 = Debug|x64
 		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Release|Win32.ActiveCfg = Release|Win32
 		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Release|Win32.Build.0 = Release|Win32
+		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Release|x64.ActiveCfg = Release|x64
+		{8AC753A3-1B8C-41F7-9469-F77F907963C2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE