Fix compilation on Mojave
This commit is contained in:
parent
a5228d8d44
commit
fb02d6855c
3 changed files with 3 additions and 3 deletions
|
@ -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@
|
||||
|
|
|
@ -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
|
||||
|
|
2
vendor/luajit/src/Makefile
vendored
2
vendor/luajit/src/Makefile
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue