diff --git a/appveyor.yml b/appveyor.yml index 96b29d9b..9adb6695 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ configuration: - Release environment: - WX_VERSION: 3.1.3 + WX_VERSION: 3.1.5 LUAJIT_VERSION: 2.0.5 for: diff --git a/build-luajit.sh b/build-luajit.sh index f8bd655c..1a68f59e 100644 --- a/build-luajit.sh +++ b/build-luajit.sh @@ -16,7 +16,7 @@ mkdir -p $INSTALL_PATH echo "Building LuaJIT version $LUAJIT_VERSION" if [[ "$OSTYPE" == "darwin"* ]]; then - BUILD_COMMAND="make MACOSX_DEPLOYMENT_TARGET=10.7 CC='gcc -arch x86_64'" + BUILD_COMMAND="make MACOSX_DEPLOYMENT_TARGET=10.10 CC='gcc -arch x86_64'" INSTALL_COMMAND="cp libluajit.a $INSTALL_PATH/lib/liblua51.a" LIBS_DIR="macosx" elif [[ "$OSTYPE" == "linux"* ]]; then diff --git a/build-wxwidgets.sh b/build-wxwidgets.sh index 62f6d961..2657b1b7 100755 --- a/build-wxwidgets.sh +++ b/build-wxwidgets.sh @@ -17,10 +17,11 @@ mkdir -p $INSTALL_PATH WX_CONFIGURE_FLAGS="\ --disable-shared \ --enable-compat28 \ - --with-macosx-version-min=10.7 \ + --with-macosx-version-min=10.10 \ --with-libpng=builtin \ --with-libjpeg=builtin \ --with-libtiff=builtin \ + --with-liblzma=builtin \ CFLAGS=-fvisibility-inlines-hidden \ CXXFLAGS='-fvisibility-inlines-hidden -stdlib=libc++' \ CPPFLAGS='-fvisibility-inlines-hidden -stdlib=libc++' \ @@ -58,7 +59,6 @@ if [ ! -d "$INSTALL_PATH/lib" ]; then tar -xjf wxWidgets-$WX_VERSION.tar.bz2 cd wxWidgets-$WX_VERSION patch -p1 -i ../wxaui-tweaks.patch - patch -p1 -i ../wxWidgets-osx-private-build-fix.patch eval $BUILD_COMMAND else echo "Using cached directory." diff --git a/premake4.lua b/premake4.lua index e9d957bf..e0e55102 100644 --- a/premake4.lua +++ b/premake4.lua @@ -56,7 +56,7 @@ solution "XWord" configuration "macosx" architecture "x64" - systemversion "10.7" + systemversion "10.10" buildoptions { "-stdlib=libc++" } linkoptions { "-stdlib=libc++", "-L/usr/local/lib" } diff --git a/wxWidgets-osx-private-build-fix.patch b/wxWidgets-osx-private-build-fix.patch deleted file mode 100644 index 538c636e..00000000 --- a/wxWidgets-osx-private-build-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 294c8a6b23de686436a36f076de6a004a110a4d1 Mon Sep 17 00:00:00 2001 -From: Stefan Csomor -Date: Tue, 5 Nov 2019 19:20:51 +0100 -Subject: [PATCH] moving datatransfer.h to source files - -former place in private.h broke Audacity builds ---- - include/wx/osx/private.h | 1 - - src/osx/carbon/clipbrd.cpp | 1 + - src/osx/carbon/dataobj.cpp | 1 + - src/osx/cocoa/dnd.mm | 1 + - src/osx/cocoa/window.mm | 1 + - 5 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h -index a49a4166f84..23fd0025fbc 100644 ---- a/include/wx/osx/private.h -+++ b/include/wx/osx/private.h -@@ -2,7 +2,6 @@ - #define _WX_PRIVATE_OSX_H_ - - #include "wx/osx/core/private.h" --#include "wx/osx/private/datatransfer.h" - - #if wxOSX_USE_IPHONE - #include "wx/osx/iphone/private.h" -diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp -index 6012d3747ef..6c463d0d999 100644 ---- a/src/osx/carbon/clipbrd.cpp -+++ b/src/osx/carbon/clipbrd.cpp -@@ -28,6 +28,7 @@ - #include "wx/scopedarray.h" - - #include "wx/osx/private.h" -+#include "wx/osx/private/datatransfer.h" - - #define wxUSE_DATAOBJ 1 - -diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp -index 61e37b7e2b1..2dbf820461a 100644 ---- a/src/osx/carbon/dataobj.cpp -+++ b/src/osx/carbon/dataobj.cpp -@@ -30,6 +30,7 @@ - #include "wx/filename.h" - - #include "wx/osx/private.h" -+#include "wx/osx/private/datatransfer.h" - - static CFStringRef kUTTypeTraditionalMacText = CFSTR("com.apple.traditional-mac-plain-text"); - -diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm -index 6ff71f619de..019d2adb18d 100644 ---- a/src/osx/cocoa/dnd.mm -+++ b/src/osx/cocoa/dnd.mm -@@ -30,6 +30,7 @@ - #include "wx/evtloop.h" - - #include "wx/osx/private.h" -+#include "wx/osx/private/datatransfer.h" - - wxOSXDataSinkItem::~wxOSXDataSinkItem() - { -diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm -index 8a8a12b948f..a589187a8e0 100644 ---- a/src/osx/cocoa/window.mm -+++ b/src/osx/cocoa/window.mm -@@ -22,6 +22,7 @@ - #ifdef __WXMAC__ - #include "wx/osx/private.h" - #include "wx/osx/private/available.h" -+ #include "wx/osx/private/datatransfer.h" - #endif - - #include "wx/evtloop.h"