Simplify resource files

elishacloud · Jun 26, 2024 · cf97428 · cf97428
1 parent d1fff9c
commit cf97428
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 78 deletions.
diff --git a/dinputto8.rc b/dinputto8.rc
@@ -1,71 +1,26 @@
 // Microsoft Visual C++ generated resource script.
 //
+#include <winver.h>
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <winresrc.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral (Default) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
-LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include <winresrc.h>\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION APP_MAJOR, APP_MINOR, APP_BUILDNUMBER, APP_REVISION
- PRODUCTVERSION APP_MAJOR, APP_MINOR, APP_BUILDNUMBER, APP_REVISION
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
+VS_VERSION_INFO   VERSIONINFO
+FILEVERSION       VERSION_NUMBER
+PRODUCTVERSION    VERSION_NUMBER
+FILEFLAGSMASK     VS_FFI_FILEFLAGSMASK
+FILEFLAGS         0
+FILEOS            VOS_NT_WINDOWS32
+FILETYPE          VFT_DLL
+FILESUBTYPE       VFT2_UNKNOWN
+{
+	BLOCK "StringFileInfo"
+	{
+		BLOCK "04090000"
+		{
 			VALUE "CompanyName", APP_COMPANYNAME
 			VALUE "FileDescription", APP_DESCRPTION
 			VALUE "FileVersion", APP_VERSION
@@ -74,25 +29,13 @@ BEGIN
 			VALUE "OriginalFilename", APP_ORIGINALVERSION
 			VALUE "ProductName", APP_NAME
 			VALUE "ProductVersion", APP_VERSION
-		END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // Neutral (Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
+		}
+	}
 
+	BLOCK "VarFileInfo"
+	{
+		VALUE "Translation", 0x409, 0
+	}
+}
 
 /////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
diff --git a/resource.h b/resource.h
@@ -20,6 +20,7 @@
 #define _TO_STRING_(x) #x
 #define _TO_STRING(x) _TO_STRING_(x)
 #define APP_VERSION _TO_STRING(APP_MAJOR) "." _TO_STRING(APP_MINOR) "." _TO_STRING(APP_BUILDNUMBER) "." _TO_STRING(APP_REVISION)
+#define VERSION_NUMBER APP_MAJOR, APP_MINOR, APP_BUILDNUMBER, APP_REVISION
 
 // Next default values for new objects
 //