v1.16-WIP

fix: disabled /GS check in clang-cl builds for now (win32)

Author: r-lyeh

MAKE.bat

@@ -207,7 +207,7 @@ where /q cl.exe || call "%ProgramFiles(x86)%/microsoft visual studio/2017/commun
 
 setlocal enableDelayedExpansion
 if "%cc%"=="" (
-set "cc=clang-cl -Wno-multichar -Wno-unused-value -Wno-macro-redefined -Wno-implicit-function-declaration -Wno-deprecated-declarations -Wno-empty-body -Wno-pointer-sign -Wno-dangling-else -Wno-string-plus-int"
+set "cc=clang-cl -GS- -Wno-multichar -Wno-unused-value -Wno-macro-redefined -Wno-implicit-function-declaration -Wno-deprecated-declarations -Wno-empty-body -Wno-pointer-sign -Wno-dangling-else -Wno-string-plus-int"
 (where /q clang-cl || set "cc=cl" >nul 2>nul)
 )
 
@@ -251,7 +251,7 @@ ping -n 2 -w 1500 localhost > nul && rem wait 1s between 2 consecutive pings, so
 where /q rcedit-x64 || curl -LO https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe
 where /q rcedit-x64 && ^
 rcedit-x64 "Spectral.exe" --set-file-version "!year!.!month!.!today!.!today!!month!" && ^
-rcedit-x64 "Spectral.exe" --set-product-version "1.15" && ^
+rcedit-x64 "Spectral.exe" --set-product-version "1.16-WIP" && ^
 rcedit-x64 "Spectral.exe" --set-icon src\res\img\noto_1f47b.ico || goto error
 
 if "%__DOTNET_PREFERRED_BITNESS%"=="32" (

src/3rd_tigr.h

@@ -2611,6 +2611,8 @@ WPARAM MapLeftRightKeys( WPARAM vk, LPARAM lParam)
     return new_vk;
 }
 
+static int tigrWinVK(int key); //< @r-lyeh
+
 LRESULT CALLBACK tigrWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     Tigr* bmp;
     TigrInternal* win = NULL;
@@ -3218,7 +3220,7 @@ static int tigrWinVK_DEPRECATED(int key) { //< @r-lyeh
     return 0;
 }
 
-static int tigrWinVK(int key) {
+int tigrWinVK(int key) {
     if (key >= 'A' && key <= 'Z')
         return key;
     if (key >= '0' && key <= '9')

src/app.c

@@ -1,3 +1,12 @@
+/*
+int _getch();
+#include <string.h>
+#define strdup  _strdup  // fucking m$
+#define strcmpi _strcmpi // fucking m$
+#include <stdio.h>
+#define fileno  _fileno  // fucking m$
+*/
+
 /* planned for v1.16
 
 - [ ] irc/lobby (mount server)
@@ -317,7 +326,7 @@ void loggers(int m);
 // [ ] XL1 (Compilation)
 #endif
 
-#define SPECTRAL "v1.15"
+#define SPECTRAL "v1.16-WIP"
 
 #ifndef DEV
 #if NDEBUG >= 2
@@ -551,7 +560,6 @@ int load_config() {
         extern int cmdkey;
         extern const char* cmdarg;
         ZX_PENTAGON = ZX & 1; ZX &= ~1;
-        if(ZX_FOLDER && ZX_FOLDER[0] > 32) cmdkey = 'SCAN', cmdarg = ZX_FOLDER;
     }
     {
         int size;
@@ -568,6 +576,11 @@ int load_config() {
         if(ZX_MEDIA  && ZX_MEDIA[0] && ZX_MEDIA[0] != '#' ) ZX_MEDIA  = strdup(abspath(ZX_MEDIA)); // @leak
         //if(ZX_SHADER && ZX_SHADER[0]) ZX_SHADER = strdup(abspath(ZX_SHADER)); // @leak
     }
+
+    // scan
+    // if(!ZX_PLAYER)
+    // if(ZX_FOLDER && ZX_FOLDER[0] > 32) rescan(ZX_FOLDER); // cmdkey = 'SCAN', cmdarg = ZX_FOLDER;
+
     return !errors;
 }