Prep for v1.4.

stefansundin · Feb 16, 2019 · 2a6afbe · 2a6afbe
1 parent eb26bc9
commit 2a6afbe
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 64 deletions.
diff --git a/build.bat b/build.bat
diff --git a/build.sh b/build.sh
@@ -1,4 +1,19 @@
 #!/bin/bash -ex
-# sudo apt-get install gcc-mingw-w64
-x86_64-w64-mingw32-windres -o superf4.o include/superf4.rc
-x86_64-w64-mingw32-gcc -o SuperF4.exe superf4.c superf4.o -mwindows -lshlwapi -lpsapi -O2 -s
+# sudo apt-get install gcc-mingw-w64 nsis
+
+if [[ "$1" == "release" ]]; then
+  mkdir -p bin/32 bin/64
+  cp SuperF4.ini bin/32/
+  cp SuperF4.ini bin/64/
+
+  i686-w64-mingw32-windres -o superf4.o include/superf4.rc
+  i686-w64-mingw32-gcc -o bin/32/SuperF4.exe superf4.c superf4.o -mwindows -lshlwapi -lpsapi -O2 -s
+
+  x86_64-w64-mingw32-windres -o superf4.o include/superf4.rc
+  x86_64-w64-mingw32-gcc -o bin/64/SuperF4.exe superf4.c superf4.o -mwindows -lshlwapi -lpsapi -O2 -s
+
+  makensis -V2 -Dx64 installer.nsi
+else
+  x86_64-w64-mingw32-windres -o superf4.o include/superf4.rc
+  x86_64-w64-mingw32-gcc -o SuperF4.exe superf4.c superf4.o -mwindows -lshlwapi -lpsapi -O2 -g -DDEBUG
+fi
diff --git a/include/autostart.c b/include/autostart.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015  Stefan Sundin
+  Copyright (C) 2019  Stefan Sundin
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/include/error.c b/include/error.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015  Stefan Sundin
+  Copyright (C) 2019  Stefan Sundin
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/include/superf4.rc b/include/superf4.rc
@@ -11,8 +11,8 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "include/x86.exe.manifest"
 
 #define VS_VERSION_INFO 1
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,3,0,0
-  PRODUCTVERSION 1,3,0,0
+  FILEVERSION 1,4,0,0
+  PRODUCTVERSION 1,4,0,0
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0x0L
   FILEOS 0x40004L
@@ -24,11 +24,11 @@ BEGIN
     BLOCK "040904b0"
     BEGIN
       VALUE "FileDescription", "SuperF4"
-      VALUE "FileVersion", "1.3"
+      VALUE "FileVersion", "1.4"
       VALUE "InternalName", "superf4"
       VALUE "OriginalFilename", "SuperF4.exe"
       VALUE "CompanyName", "Stefan Sundin"
-      VALUE "LegalCopyright", "� Stefan Sundin 2015"
+      VALUE "LegalCopyright", "� Stefan Sundin 2019"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/include/tray.c b/include/tray.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015  Stefan Sundin
+  Copyright (C) 2019  Stefan Sundin
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/installer.nsi b/installer.nsi
@@ -1,4 +1,4 @@
-; Copyright (C) 2015  Stefan Sundin
+; Copyright (C) 2019  Stefan Sundin
 ;
 ; This program is free software: you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -9,7 +9,7 @@
 
 
 !define APP_NAME      "SuperF4"
-!define APP_VERSION   "1.3"
+!define APP_VERSION   "1.4"
 !define APP_URL       "https://stefansundin.github.io/superf4/"
 
 
@@ -148,12 +148,12 @@ Section "" sec_app
   ; Install files
   !ifdef x64
   ${If} ${RunningX64}
-    File "bin\x64\${APP_NAME}.exe"
+    File "bin\64\${APP_NAME}.exe"
   ${Else}
-    File "bin\${APP_NAME}.exe"
+    File "bin\32\${APP_NAME}.exe"
   ${EndIf}
   !else
-  File "bin\${APP_NAME}.exe"
+  File "bin\32\${APP_NAME}.exe"
   !endif
   File "${APP_NAME}.ini"
 

diff --git a/localization/strings.h b/localization/strings.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015  Stefan Sundin
+  Copyright (C) 2019  Stefan Sundin
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/superf4.c b/superf4.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015  Stefan Sundin
+  Copyright (C) 2019  Stefan Sundin
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 // App
 #define APP_NAME            L"SuperF4"
-#define APP_VERSION         "1.3"
+#define APP_VERSION         "1.4"
 #define APP_URL             L"https://stefansundin.github.io/superf4/"
 
 // Messages
@@ -326,10 +326,11 @@ LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) {
         // Prevent this keypress from being propagated
         return 1;
       }
-      // Check for [the windows key]+F4
+      // Check for Win+F4
       else if (vkey == VK_LWIN) {
         win = 1;
       }
+      // Note: Ctrl+Win+F4 is a shortcut to close virtual desktops
       else if (!ctrl && win && vkey == VK_F4) {
         // Double check that the windows button is being pressed
         if (!(GetAsyncKeyState(VK_LWIN)&0x8000)) {