From ef9e8968f86ce1598e809a77610c18ae523e60c1 Mon Sep 17 00:00:00 2001
From: Razish <mrrazish@gmail.com>
Date: Sat, 14 Oct 2023 16:27:11 +1100
Subject: [PATCH] re-enable linux and mac builds, cleanup packaging, more
 windows x86_64 fixes

---
 .github/workflows/build.yml | 8 +++-----
 SConstruct                  | 9 ++++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7418d15..552c9e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,6 @@ jobs:
 
   ubuntu:
     name: Ubuntu ${{ matrix.arch }} ${{ matrix.build_type }}
-    if: ${{ false }} # disable for now
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -142,7 +141,6 @@ jobs:
 
   macos:
     name: macOS ${{ matrix.arch }} ${{ matrix.build_type }}
-    if: ${{ false }} # disable for now
     runs-on: macos-12
     strategy:
       fail-fast: false
@@ -192,8 +190,8 @@ jobs:
 
       - name: Create binary archives
         run: |
-          7z a -r japp-windows-x86.zip ./japp-windows-x86-Release/* '-x!msvcp*.*' '-x!vcruntime*.*' '-x!concrt*.*'
-          7z a -r japp-windows-x86_64.zip ./japp-windows-x86_64-Release/* '-x!msvcp*.*' '-x!vcruntime*.*' '-x!concrt*.*'
+          7z a -r japp-windows-x86.zip ./japp-windows-x86-Release/*
+          7z a -r japp-windows-x86_64.zip ./japp-windows-x86_64-Release/*
           mv ./japp-linux-x86-Release/* japp-linux-x86.tar.gz
           mv ./japp-linux-x86_64-Release/* japp-linux-x86_64.tar.gz
           mv ./japp-macos-x86_64-Release/* japp-macos-x86_64.tar.gz
@@ -247,7 +245,7 @@ jobs:
       - name: Create archive
         run: |
           if [ "${{ matrix.zip }}" == "true" ]; then
-            7z a -r ${{ matrix.artifact_name }} ./${{ matrix.artifact_dir }}/* '-x!msvcp*.*' '-x!vcruntime*.*' '-x!concrt*.*'
+            7z a -r ${{ matrix.artifact_name }} ./${{ matrix.artifact_dir }}/*
           else
             mv ./${{ matrix.artifact_dir }}/* ${{ matrix.artifact_name }}
           fi
diff --git a/SConstruct b/SConstruct
index cf6c167..1a3ba78 100644
--- a/SConstruct
+++ b/SConstruct
@@ -475,8 +475,15 @@ elif env["CC"] == "cl":
     env["LINKFLAGS"] += [
         "/ERRORREPORT:none",  # don't send error reports for internal linker errors
         "/NOLOGO",  # remove watermark
-        "/MACHINE:" + arch,  # 32/64 bit linking
     ]
+    if arch == "x86_64":
+        env["LINKFLAGS"] += [
+            "/MACHINE:X64",
+        ]
+    else:
+        env["LINKFLAGS"] += [
+            "/MACHINE:" + arch,
+        ]
     if bits == 64:
         env["LINKFLAGS"] += [
             "/SUBSYSTEM:WINDOWS",  # graphical application