Apply Win32 workaronds

Author: MarijnS95

.github/workflows/ci.yaml

@@ -6,8 +6,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      # Also enable GKREGEX, because building with Ninja does not count as MSVC hence it doesn't get enabled by default
-      - run:  cmake -Bbuild -GNinja -DCMAKE_C_COMPILER=clang -DGKREGEX=ON
+      - run:  cmake -Bbuild -GNinja -DCMAKE_C_COMPILER=clang
           # -DCMAKE_CXX_COMPILER=clang++
       - run:  cmake --build build
 

CMakeLists.txt

@@ -9,6 +9,8 @@ unset(abs)
 include(GKlibSystem.cmake)
 
 include_directories(".")
+
+# Don't worry, this will be removed
 if(MSVC)
   include_directories("win32")
   file(GLOB win32_sources RELATIVE "win32" "*.c")

GKlibSystem.cmake

@@ -17,14 +17,14 @@ option(NO_X86 "enable NO_X86 support" OFF)
 
 
 # Add compiler flags.
-if(MSVC)
+if(WIN32)
   set(GKlib_COPTS "/Ox")
   set(GKlib_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX")
 elseif(MINGW)
   set(GKlib_COPTS "-DUSE_GKREGEX")
 else()
   set(GKlib_COPTIONS "-DLINUX -D_FILE_OFFSET_BITS=64")
-endif(MSVC)
+endif(WIN32)
 if(CYGWIN)
   set(GKlib_COPTIONS "${GKlib_COPTIONS} -DCYGWIN")
 endif(CYGWIN)
@@ -125,7 +125,7 @@ endif(HAVE_GETLINE)
 
 
 # Custom check for TLS.
-if(MSVC)
+if(WIN32)
    set(GKlib_COPTIONS "${GKlib_COPTIONS} -D__thread=__declspec(thread)")
 
   # This if checks if that value is cached or not.