mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-01-31 01:15:17 +01:00
CMake: Switch from SKIP_POSTPROCESS_BUNDLE to POSTPROCESS_BUNDLE
This commit is contained in:
@@ -296,7 +296,7 @@ def build(config):
|
|||||||
+ python_to_cmake_bool(config["autoupdate"]),
|
+ python_to_cmake_bool(config["autoupdate"]),
|
||||||
'-DDISTRIBUTOR=' + config['distributor'],
|
'-DDISTRIBUTOR=' + config['distributor'],
|
||||||
# Distributable bundles need to be postprocessed to embed dependencies
|
# Distributable bundles need to be postprocessed to embed dependencies
|
||||||
"-DSKIP_POSTPROCESS_BUNDLE=OFF",
|
"-DPOSTPROCESS_BUNDLE=ON",
|
||||||
# Always use libraries from Externals to prevent any libraries
|
# Always use libraries from Externals to prevent any libraries
|
||||||
# installed by Homebrew from leaking in to the app
|
# installed by Homebrew from leaking in to the app
|
||||||
"-DUSE_SYSTEM_LIBS=OFF",
|
"-DUSE_SYSTEM_LIBS=OFF",
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ if(APPLE)
|
|||||||
enable_language(OBJC)
|
enable_language(OBJC)
|
||||||
enable_language(OBJCXX)
|
enable_language(OBJCXX)
|
||||||
option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
|
option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
|
||||||
option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" ON)
|
option(POSTPROCESS_BUNDLE "Postprocess bundle for redistributability" OFF)
|
||||||
# Enable adhoc code signing by default (otherwise makefile builds on ARM will not work)
|
# Enable adhoc code signing by default (otherwise makefile builds on ARM will not work)
|
||||||
option(MACOS_CODE_SIGNING "Enable codesigning" ON)
|
option(MACOS_CODE_SIGNING "Enable codesigning" ON)
|
||||||
option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON)
|
option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON)
|
||||||
|
|||||||
@@ -661,7 +661,7 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT SKIP_POSTPROCESS_BUNDLE)
|
if(POSTPROCESS_BUNDLE)
|
||||||
# Update library references to make the bundle portable
|
# Update library references to make the bundle portable
|
||||||
include(DolphinPostprocessBundle)
|
include(DolphinPostprocessBundle)
|
||||||
dolphin_postprocess_bundle(dolphin-emu)
|
dolphin_postprocess_bundle(dolphin-emu)
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ endforeach()
|
|||||||
include(DolphinInjectVersionInfo)
|
include(DolphinInjectVersionInfo)
|
||||||
dolphin_inject_version_info(MacUpdater)
|
dolphin_inject_version_info(MacUpdater)
|
||||||
|
|
||||||
if(NOT SKIP_POSTPROCESS_BUNDLE)
|
if(POSTPROCESS_BUNDLE)
|
||||||
# Update library references to make the bundle portable
|
# Update library references to make the bundle portable
|
||||||
include(DolphinPostprocessBundle)
|
include(DolphinPostprocessBundle)
|
||||||
dolphin_postprocess_bundle(MacUpdater)
|
dolphin_postprocess_bundle(MacUpdater)
|
||||||
|
|||||||
Reference in New Issue
Block a user