Merge pull request #42 from mkilgore/use-exeicon-versioninfo

Use $EXEICON and $VERSIONINFO in qb64.bas, replacing the existing icon.rc file
QB64-Phoenix-Edition · May 8, 2022 · f2b7639 · f2b7639
2 parents 253ab98 + be81403
commit f2b7639
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 29 deletions.
diff --git a/source/global/version.bas b/source/global/version.bas
@@ -1,7 +1,9 @@
 DIM SHARED Version AS STRING
 DIM SHARED IsCiVersion AS _BYTE
 
-Version$ = "0.5.0"
+Version$ = "0.6.0"
+$VERSIONINFO:FileVersion#=0,6,0,0
+$VERSIONINFO:ProductVersion#=0,6,0,0
 
 ' If ./internal/version.txt exist, then this is some kind of CI build with a label
 If _FILEEXISTS("internal/version.txt") THEN

diff --git a/source/icon.rc b/source/icon.rc
@@ -1,28 +1,28 @@
-0 ICON "qb64.ico"
-
-1 VERSIONINFO
-FILEVERSION     2,1,0,0
-PRODUCTVERSION  2,1,0,0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName","QB64\0"
-            VALUE "FileDescription","QB64 Compiler\0"
-            VALUE "FileVersion","2.1\0"
-            VALUE "InternalName","qb64.bas\0"
-            VALUE "LegalCopyright","LGPL\0"
-            VALUE "LegalTrademarks","\0"
-            VALUE "OriginalFilename","qb64.exe\0"
-            VALUE "ProductName","QB64\0"
-            VALUE "ProductVersion","2.1\0"
-            VALUE "Comments","QB64 is a modern extended BASIC programming language that retains QB4.5/QBasic compatibility and compiles native binaries for Windows, Linux and macOS.\0"
-        END
-    END
-
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 0x04E4
-    END
-END
+0 ICON "qb64.ico"
+
+1 VERSIONINFO
+FILEVERSION     2,1,0,0
+PRODUCTVERSION  2,1,0,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName","QB64\0"
+            VALUE "FileDescription","QB64 Compiler\0"
+            VALUE "FileVersion","2.1\0"
+            VALUE "InternalName","qb64.bas\0"
+            VALUE "LegalCopyright","LGPL\0"
+            VALUE "LegalTrademarks","\0"
+            VALUE "OriginalFilename","qb64.exe\0"
+            VALUE "ProductName","QB64\0"
+            VALUE "ProductVersion","2.1\0"
+            VALUE "Comments","QB64 is a modern extended BASIC programming language that retains QB4.5/QBasic compatibility and compiles native binaries for Windows, Linux and macOS.\0"
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x04E4
+    END
+END
diff --git a/source/qb64.bas b/source/qb64.bas
@@ -10,6 +10,17 @@ $CONSOLE
 'Initially the "SCREEN" will be hidden, if the -x option is used it will never be created
 $SCREENHIDE
 
+$EXEICON:'./qb64.ico'
+
+$VERSIONINFO:CompanyName=QB64
+$VERSIONINFO:FileDescription=QB64 Compiler
+$VERSIONINFO:InternalName=qb64.bas
+$VERSIONINFO:LegalCopyright=MIT
+$VERSIONINFO:LegalTrademarks=
+$VERSIONINFO:OriginalFilename=qb64.exe
+$VERSIONINFO:ProductName=QB64
+$VERSIONINFO:Comments=QB64 is a modern extended BASIC programming language that retains QB4.5/QBasic compatibility and compiles native binaries for Windows, Linux and macOS.
+
 '$INCLUDE:'global\version.bas'
 '$INCLUDE:'global\settings.bas'
 '$INCLUDE:'global\constants.bas'