Fix compilation on Mojave

This commit is contained in:
Ryan Lucia 2019-05-16 17:41:18 -04:00
parent a5228d8d44
commit fb02d6855c
3 changed files with 3 additions and 3 deletions

View File

@ -104,7 +104,7 @@ LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
LIBS_UCHARDET = @UCHARDET_LIBS@ LIBS_UCHARDET = @UCHARDET_LIBS@
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
endif endif
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@

View File

@ -10,7 +10,7 @@ resrc_OBJ := \
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp $(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)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h $(d)default_config.cpp: $(d)default_config.h

View File

@ -298,7 +298,7 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
endif endif
ifeq (Darwin,$(TARGET_SYS)) ifeq (Darwin,$(TARGET_SYS))
ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
export MACOSX_DEPLOYMENT_TARGET=10.4 export MACOSX_DEPLOYMENT_TARGET=10.6
endif endif
TARGET_STRIP+= -x TARGET_STRIP+= -x
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC