Index: build/premake/premake5/build/gmake.macosx/Premake5.make =================================================================== --- build/premake/premake5/build/gmake.macosx/Premake5.make +++ build/premake/premake5/build/gmake.macosx/Premake5.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim -I../../contrib/zlib -I../../contrib/libzip -I../../contrib/curl/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim -I../../contrib/zlib -I../../contrib/libzip -I../../contrib/curl/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -586,4 +586,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/curl-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/curl-lib.make +++ build/premake/premake5/build/gmake.macosx/curl-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/curl/include -I../../contrib/curl/lib -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/curl/include -I../../contrib/curl/lib -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -1279,4 +1279,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/example.make =================================================================== --- build/premake/premake5/build/gmake.macosx/example.make +++ build/premake/premake5/build/gmake.macosx/example.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Release/libluashim-lib.a LDDEPS += bin/Release/libluashim-lib.a - ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src -I../../contrib/luashim FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += bin/Debug/libluashim-lib.a LDDEPS += bin/Debug/libluashim-lib.a - ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -dynamiclib -Wl,-install_name,@rpath/example.so -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -145,4 +145,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/lua-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/lua-lib.make +++ build/premake/premake5/build/gmake.macosx/lua-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -424,4 +424,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/luashim-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/luashim-lib.make +++ build/premake/premake5/build/gmake.macosx/luashim-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -fPIC -Wall -Wextra -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/lua/src FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -fPIC -g -Wall -Wextra -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -145,4 +145,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/mbedtls-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/mbedtls-lib.make +++ build/premake/premake5/build/gmake.macosx/mbedtls-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/mbedtls/include -I../../contrib/zlib FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -766,4 +766,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/zip-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/zip-lib.make +++ build/premake/premake5/build/gmake.macosx/zip-lib.make @@ -27,12 +27,12 @@ INCLUDES += -I../../contrib/libzip/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += -I../../contrib/libzip/include FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -910,4 +910,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/premake/premake5/build/gmake.macosx/zlib-lib.make =================================================================== --- build/premake/premake5/build/gmake.macosx/zlib-lib.make +++ build/premake/premake5/build/gmake.macosx/zlib-lib.make @@ -27,12 +27,12 @@ INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -w -fno-stack-protector -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -62,12 +62,12 @@ INCLUDES += FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=10.4 + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -w -mmacosx-version-min=$(MIN_OSX_VERSION) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=10.4 + ALL_LDFLAGS += $(LDFLAGS) -mmacosx-version-min=$(MIN_OSX_VERSION) LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -271,4 +271,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif Index: build/workspaces/build-osx-bundle.sh =================================================================== --- build/workspaces/build-osx-bundle.sh +++ build/workspaces/build-osx-bundle.sh @@ -23,12 +23,14 @@ export ARCH=${ARCH:="x86_64"} OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"` +OSX_VERSION=10.14 + # Set SDK and mimimum required OS X version export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"} -export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"} +export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.9"} # 0 A.D. release version, e.g. Alpha 21 is 0.0.21 -BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"} +BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.23b"} # Define compiler as "clang", this is all Mavericks supports. # gcc symlinks may still exist, but they are simply clang with Index: libraries/osx/build-osx-libs.sh =================================================================== --- libraries/osx/build-osx-libs.sh +++ libraries/osx/build-osx-libs.sh @@ -196,7 +196,7 @@ tar -xf $LIB_ARCHIVE pushd $LIB_DIRECTORY - (./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --enable-ipv6 --with-darwinssl --without-gssapi --without-libmetalink --without-librtmp --without-libssh2 --without-nss --without-polarssl --without-spnego --disable-ares --disable-ldap --disable-ldaps --without-libidn2 --with-zlib="${ZLIB_DIR}" --enable-shared=no && make ${JOBS} && make install) || die "libcurl build failed" + (./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --without-libpsl --enable-ipv6 --with-darwinssl --without-gssapi --without-libmetalink --without-librtmp --without-libssh2 --without-nss --without-polarssl --without-spnego --disable-ares --disable-ldap --disable-ldaps --without-libidn2 --with-zlib="${ZLIB_DIR}" --enable-shared=no && make ${JOBS} && make install) || die "libcurl build failed" popd touch .already-built else @@ -516,7 +516,7 @@ tar -xf $LIB_ARCHIVE pushd $LIB_DIRECTORY/nspr - (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" && make ${JOBS} && make install) || die "NSPR build failed" + (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --enable-64bit --prefix="$NSPR_DIR" && make ${JOBS} && make install) || die "NSPR build failed" popd # TODO: how can we not build the dylibs? rm -f lib/*.dylib