Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash on latest MacOS version. #150

Merged
merged 1 commit into from
Jul 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ configuration:
- Release

environment:
WX_VERSION: 3.1.3
WX_VERSION: 3.1.5
LUAJIT_VERSION: 2.0.5

for:
Expand Down
2 changes: 1 addition & 1 deletion build-luajit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build-wxwidgets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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++' \
Expand Down Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion premake4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
74 changes: 0 additions & 74 deletions wxWidgets-osx-private-build-fix.patch

This file was deleted.