Fix macOS build issue with recent commit
Add objc_args in meson when compiling to pass C defines also to bundle_open.m. Default "bundle" option to false to have by default a unix-like build and install. In the run-local script always expect that "bundle" option is to false to have a unix-like install. In the build-package script pass the -Dbundle=true option when building on macos. When setting the resouce path revert to original method using [[NSBundle mainBundle] resourcePath] to have the real resource path when the bundle option will be activated. With the recent commit the function set_macos_bundle_resources will be called only if the "bundle" option is activate and is not used in unix-like mode.
This commit is contained in:
+1
-4
@@ -47,10 +47,7 @@ if [[ "$OSTYPE" == "msys"* || "$OSTYPE" == "mingw"* ]]; then
|
||||
fi
|
||||
|
||||
rundir=".run"
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
bindir="$rundir"
|
||||
datadir="$rundir"
|
||||
elif [ "$option_portable" == on ]; then
|
||||
if [ "$option_portable" == on ]; then
|
||||
bindir="$rundir"
|
||||
datadir="$rundir/data"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user