[gens-qt4] resources/win32/: Synchronized the resources with gens-sdl. feature/gens-sdl-Win32-resources github/feature/gens-sdl-Win32-resources
authorDavid Korth <gerbilsoft@gerbilsoft.com>
Thu, 3 Sep 2015 03:35:40 +0000 (23:35 -0400)
committerDavid Korth <gerbilsoft@gerbilsoft.com>
Thu, 3 Sep 2015 03:35:40 +0000 (23:35 -0400)
config.gens-qt4.h.in: Added the CMake version macros.

src/gens-qt4/config.gens-qt4.h.in
src/gens-qt4/resources/win32/gens-qt4.exe.manifest
src/gens-qt4/resources/win32/gens-qt4.rc

index 5c457b7..00c18c0 100644 (file)
 /* Define to 1 if QtDBus is available. */
 #cmakedefine QT_QTDBUS_FOUND 1
 
+/* CMake version macros. */
+#define VERSION_MAJOR @VERSION_MAJOR@
+#define VERSION_MINOR @VERSION_MINOR@
+#define VERSION_PATCH @VERSION_PATCH@
+#define VERSION_DEVEL @VERSION_DEVEL@
+#define VERSION_STRING "@VERSION_STRING@"
+#define VERSION_STRING_WIN32 "@VERSION_STRING_WIN32@"
+
 #endif /* __GENS_QT4_CONFIG_H__ */
index 43c2890..e9b397c 100644 (file)
@@ -2,13 +2,13 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
        <assemblyIdentity
                type="win32"
-               name="Gens.GS.II"
-               version="0.0.0.0"
+               name="Gens/GS II (Qt4 frontend)"
+               version="0.0.0.1"
                processorArchitecture="x86"
        />
-       
-       <description>Gens/GS II (Development Build)</description>
-       
+
+       <description>Gens/GS II (Qt4 frontend)</description>
+
        <!-- Common Controls 6. Needed for visual styles on XP and later. -->
        <dependency>
                <dependentAssembly>
@@ -22,7 +22,7 @@
                        />
                </dependentAssembly>
        </dependency>
-       
+
        <!-- Application security requirements. Used for Vista UAC. -->
        <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
                <security>
                        </requestedPrivileges>
                </security>
        </trustInfo>
-       
-       <!-- Mark this program as DPI-aware on Windows Vista and later. -->
+
+       <!-- Mark this program as *not* DPI-aware on Windows Vista and later. -->
        <asmv3:application>
                <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-                       <dpiAware>true</dpiAware>
+                       <dpiAware>false</dpiAware>
                </asmv3:windowsSettings>
        </asmv3:application>
+
+       <!-- Operating system compatibility. -->
+       <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+               <application>
+                       <!--The ID below indicates application support for Windows Vista -->
+                       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+
+                       <!--The ID below indicates application support for Windows 7 -->
+                       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+               </application>
+       </compatibility>
 </assembly>  
index 6f8bd1d..ba6998f 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.           *
  ***************************************************************************/
 
-// Resource script for Gens/GS Win32
+// Resource script for Gens/GS II's Qt4 frontend.
+#include <config.gens-qt4.h>
 #include "gens-qt4.h"
-#include "winnt.rh"
+#include "winresrc.h"
 
 // git version
 #include "libgens/macros/git.h"
@@ -38,9 +39,11 @@ IDI_SONIC_WAITING    ICON            "sonic_wait.ico"
 // Manifest.
 CREATEPROCESS_MANIFEST_RESOURCE_ID     RT_MANIFEST     "gens-qt4.exe.manifest"
 
-// TODO: Gens/GS version number.
-#define GENS_GS_VERSION "0.0.0 (Development Build)"
-#define GENS_VERSION_WIN32 0,0,0,0
+// TODO: Define "Development Build" as VERSION_DESC or something.
+// TODO: Update all version definitions to match libzomg.
+// Also update libgens, etc. to match libzomg.
+#define GENS_GS_VERSION VERSION_STRING " (Development Build)"
+#define GENS_VERSION_WIN32 VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,VERSION_DEVEL
 
 #ifdef GENS_GIT_VERSION
 #define Win32_RC_FileVersion GENS_GS_VERSION "\r\n" GENS_GIT_VERSION
@@ -66,18 +69,18 @@ BEGIN
        BEGIN
                BLOCK "040904b0"
                BEGIN
-                       //VALUE "Comments", "\0"
-                       //VALUE "CompanyName", "\0"
-                       VALUE "FileDescription", "Gens/GS II " GENS_GS_VERSION "\0"
-                       VALUE "FileVersion", "Gens/GS II " Win32_RC_FileVersion "\0"
-                       VALUE "InternalName", "Gens/GS II\0"
-                       //VALUE "LegalCopyright", "\0"
-                       //VALUE "LegalTrademarks", "\0"
-                       //VALUE "OriginalFilename", "\0"
-                       //VALUE "PrivateBuild", "\0"
-                       VALUE "ProductName", "Gens/GS II\0"
-                       VALUE "ProductVersion", "Gens/GS II " Win32_RC_FileVersion "\0"
-                       //VALUE "SpecialBuild", "\0"
+                       //VALUE "Comments", ""
+                       //VALUE "CompanyName", ""
+                       VALUE "FileDescription", "Gens/GS II (Qt4 frontend)"
+                       VALUE "FileVersion", Win32_RC_FileVersion
+                       VALUE "InternalName", "Gens/GS II (Qt4 frontend)"
+                       //VALUE "LegalCopyright", ""
+                       //VALUE "LegalTrademarks", ""
+                       //VALUE "OriginalFilename", ""
+                       //VALUE "PrivateBuild", ""
+                       VALUE "ProductName", "Gens/GS II (Qt4 frontend)"
+                       VALUE "ProductVersion", Win32_RC_FileVersion
+                       //VALUE "SpecialBuild", ""
                END
        END
        BLOCK "VarFileInfo"