From 8db1fe25d7214668e5cb31c014f6a2818e815796 Mon Sep 17 00:00:00 2001
From: TheTank20 <57580668+thepwrtank18@users.noreply.github.com>
Date: Thu, 3 Jul 2025 12:11:00 -0500
Subject: [PATCH] Make UMSKT (mostly) static on macOS (#126)

---
 .github/workflows/macos.yml | 3 ++-
 CMakeLists.txt              | 9 +++++----
 README.md                   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a0282dc..d8e398e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -73,6 +73,7 @@ jobs:
 
       - name: Move files to correct directory
         run: |
+          ls -a build
           mkdir -p build/actions_upload
           mv build/umskt build/actions_upload/umskt
 
@@ -111,4 +112,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with: 
           name: UMSKT-macOS-universal
-          path: fat/umskt
+          path: fat
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 534f89a..d97858b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,10 +77,10 @@ IF(DJGPP_WATT32)
     MESSAGE(STATUS "[UMSKT] Using i386 target for DOS DGJPP")
 ENDIF()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  SET(BUILD_SHARED_LIBS ON)
-  MESSAGE(STATUS "[UMSKT] macOS has no static library - Shared library forced on")
-endif()
+##if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+##  SET(BUILD_SHARED_LIBS ON)
+##  MESSAGE(STATUS "[UMSKT] macOS has no static library - Shared library forced on")
+##endif()
 
 # if we're compiling with MSVC, respect the DEBUG compile option
 IF(MSVC)
@@ -167,6 +167,7 @@ CPMAddPackage(
         GITHUB_REPOSITORY fmtlib/fmt
         GIT_TAG 10.0.0
         VERSION 10.0.0
+	#OPTIONS "FMT_INSTALL YES" "BUILD_SHARED_LIBS OFF"
 )
 
 # Include cmrc resource compiler
diff --git a/README.md b/README.md
index 5f15090..52e963a 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ For Windows, click [here](https://slproweb.com/products/Win32OpenSSL.html) and c
 *Note: This only applies if the build you download has OpenSSL embedded (static library) or not. You can usually tell if the download size is measured in KB or MB. If it's MB, you don't need this.*
 
 #### 3. Run `umskt` to generate a key, or add `--help` or `-h` to see more options.
-
+*Note: on macOS, like all unsigned executables, you'll need to hold Ctrl while right clicking and selecting Open to actually open it.*
 #### 4. *(Activation step for `Retail` and `OEM` only)*
 * After installation, you will be prompted to activate Windows.