diff options
| -rwxr-xr-x | BuildMacOSUniversalBinary.py | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/MacUpdater/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/BuildMacOSUniversalBinary.py b/BuildMacOSUniversalBinary.py index 5eff0d0cfc..3fc84a1c15 100755 --- a/BuildMacOSUniversalBinary.py +++ b/BuildMacOSUniversalBinary.py @@ -295,6 +295,8 @@ def build(config): "-DENABLE_AUTOUPDATE=" + python_to_cmake_bool(config["autoupdate"]), '-DDISTRIBUTOR=' + config['distributor'], + # Distributable bundles need to be postprocessed to embed dependencies + "-DPOSTPROCESS_BUNDLE=ON", # Always use libraries from Externals to prevent any libraries # installed by Homebrew from leaking in to the app "-DUSE_SYSTEM_LIBS=OFF", diff --git a/CMakeLists.txt b/CMakeLists.txt index a75bf1692f..170b7e0632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ if(APPLE) enable_language(OBJC) enable_language(OBJCXX) option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF) - option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF) + option(POSTPROCESS_BUNDLE "Postprocess bundle for redistributability" OFF) # Enable adhoc code signing by default (otherwise makefile builds on ARM will not work) option(MACOS_CODE_SIGNING "Enable codesigning" ON) option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON) diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 9ec64cb459..457ed8a157 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -671,7 +671,7 @@ if(APPLE) endif() endif() - if(NOT SKIP_POSTPROCESS_BUNDLE) + if(POSTPROCESS_BUNDLE) # Update library references to make the bundle portable include(DolphinPostprocessBundle) dolphin_postprocess_bundle(dolphin-emu) diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt index 98ee4d78f7..459531d39a 100644 --- a/Source/Core/MacUpdater/CMakeLists.txt +++ b/Source/Core/MacUpdater/CMakeLists.txt @@ -53,7 +53,7 @@ endforeach() include(DolphinInjectVersionInfo) dolphin_inject_version_info(MacUpdater) -if(NOT SKIP_POSTPROCESS_BUNDLE) +if(POSTPROCESS_BUNDLE) # Update library references to make the bundle portable include(DolphinPostprocessBundle) dolphin_postprocess_bundle(MacUpdater) |