iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

[build] apply patch for lua

This commit is contained in:
odrling 2019-08-20 01:52:21 +02:00
parent 30f2d5ac09
commit deaf588af9
7 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.inc.in
View File

@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@
HAVE_OSS = @with_oss@
HAVE_PORTAUDIO = @with_portaudio@
HAVE_UCHARDET = @with_uchardet@
SYSTEM_LUAJIT = @with_system_luajit@
##############
# BUILD OUTPUT

8
automation/Makefile
View File

@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
$(MKDIR_INSTALL)
aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
ifeq (no, $(SYSTEM_LUAJIT))
aegisub-lua_OBJ += $(LIBS_LUA)
else
aegisub-lua_LIBS += $(LIBS_LUA)
endif
PROGRAM += $(d)aegisub-lua
test-automation: $(PROGRAM)

6
configure.ac
View File

@ -429,13 +429,15 @@ AS_IF([test $with_system_luajit = no],
[AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
AC_SUBST(with_system_luajit)
# We also need a Lua binary to run part of the build system
# Which version doesn't matter as the scripts are portable between them
AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
AC_PATH_PROGS([LUA], [luajit lua lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
# If the user doesn't have an installed copy of Lua, just use the one built
# as part of building LuaJIT
AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
AS_IF([test -z $LUA], [LUA='$(TOP)vendor/luajit/src/host/minilua'])
######################################################
# Debugging support

5
header.mk
View File

@ -13,7 +13,10 @@ subdirs := \
tests \
tools \
vendor/luabins \
vendor/luajit
ifeq (no, $(SYSTEM_LUAJIT))
subdirs += vendor/luajit
endif
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))

9
src/Makefile
View File

@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
$(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST)
src_CXXFLAGS := $(CXXFLAGS_WX)
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
$(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
@ -111,11 +111,16 @@ src_OBJ := \
$(d)video_provider_yuv4mpeg.o \
$(d)video_slider.o \
$(d)visual_feature.o \
$(LIBS_LUA) \
$(TOP)lib/libaegisub.a \
$(TOP)lib/libluabins.a \
$(TOP)lib/libresrc.a \
ifeq (no, $(SYSTEM_LUAJIT))
src_OBJ += $(LIBS_LUA)
else
src_LIBS += $(LIBS_LUA)
endif
ifeq (yes, $(BUILD_DARWIN))
src_OBJ += $(d)font_file_lister_coretext.o
src_OBJ += $(patsubst %.mm,%.o,$(sort $(wildcard $(d)osx/*.mm)))

2
src/libresrc/Makefile
View File

@ -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; $(TOP)$(BIN_LUA) $(TOP)tools/respack.lua
RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua
$(d)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h

4
tools/Makefile
View File

@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
PROGRAM += $(d)repack-thes-dict
$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
ifeq (no, $(SYSTEM_LUAJIT))
$(TOP)tools/respack.lua: $(BIN_LUA)
endif
include $(TOP)Makefile.target