mirror of
https://github.com/Neo-Desktop/WindowsXPKg
synced 2025-12-08 03:05:12 +02:00
Make UMSKT (mostly) static on macOS (#126)
This commit is contained in:
3
.github/workflows/macos.yml
vendored
3
.github/workflows/macos.yml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user