Commit 0ba8c6ff authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.9

parents 3e13df99 3fe2c93d
Pipeline #267399062 passed with stages
in 95 minutes and 2 seconds
......@@ -802,6 +802,7 @@ case "$target" in
SYS_GL_LIB=""
SYS_GLU_LIB=""
test x$build_regular = xfalse || LIBS="$LIBS -framework OpenGL -framework CoreFoundation -framework CoreServices"
CXXFLAGS="${CXXFLAGS} -DGL_SILENCE_DEPRECATION"
unset OBJC
macosx=true
default_enable_sysinstall=false
......
......@@ -8,6 +8,7 @@ test -z "${DIR}" && DIR="`pwd`"
TITLE="@progtitle@@progtitle_server@"
BUNDLE="${DIR}/${TITLE}.app"
rm -rf "${BUNDLE}"
mkdir -p "${BUNDLE}" || exit $?
# add plist with @v@ -> value and progtitle replacements
......
......@@ -279,7 +279,7 @@ context.test: rootcontext.64
#***************************************************************
# macOS builds are done without docker
MACOS_CONFIG_ARGS="--disable-sysinstall --disable-etc --prefix=/usr"
MACOS_CONFIG_ARGS="--disable-restoreold --enable-automakedefaults --disable-useradd --disable-sysinstall --disable-initscripts --disable-uninstall --disable-etc --prefix=/usr"
MACOS_BUILD_BUNDLE="./desktop/os-x/build_bundle.sh"
macOS/client_build.tag: context.64 #Makefile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment