From fb02d6855ce8394a45a29611fd9e5c64edf4f5a9 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Thu, 16 May 2019 17:41:18 -0400 Subject: [PATCH] Fix compilation on Mojave --- Makefile.inc.in | 2 +- src/libresrc/Makefile | 2 +- vendor/luajit/src/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc.in b/Makefile.inc.in index a8c0e0c48..5f1a4054f 100644 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -104,7 +104,7 @@ LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ LIBS_UCHARDET = @UCHARDET_LIBS@ ifeq (yes, $(BUILD_DARWIN)) -LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so +LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a endif FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile index 8b6d19595..6058ff9a3 100644 --- a/src/libresrc/Makefile +++ b/src/libresrc/Makefile @@ -10,7 +10,7 @@ resrc_OBJ := \ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp -RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua +RESPACK := cd $(TOP)src/libresrc; $(TOP)$(BIN_LUA) $(TOP)tools/respack.lua $(d)bitmap.cpp: $(d)bitmap.h $(d)default_config.cpp: $(d)default_config.h diff --git a/vendor/luajit/src/Makefile b/vendor/luajit/src/Makefile index 5fba38718..16ddd9a17 100644 --- a/vendor/luajit/src/Makefile +++ b/vendor/luajit/src/Makefile @@ -298,7 +298,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector endif ifeq (Darwin,$(TARGET_SYS)) ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) - export MACOSX_DEPLOYMENT_TARGET=10.4 + export MACOSX_DEPLOYMENT_TARGET=10.6 endif TARGET_STRIP+= -x TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC