summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile
index aac78beb..e6954a95 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,6 @@
12 12
13MAJVER= 2 13MAJVER= 2
14MINVER= 0 14MINVER= 0
15RELVER= 5
16ABIVER= 5.1 15ABIVER= 5.1
17NODOTABIVER= 51 16NODOTABIVER= 51
18 17
@@ -308,7 +307,7 @@ ifeq (Darwin,$(TARGET_SYS))
308 TARGET_STRIP+= -x 307 TARGET_STRIP+= -x
309 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 308 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
310 TARGET_DYNXLDOPTS= 309 TARGET_DYNXLDOPTS=
311 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 310 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
312 ifeq (x64,$(TARGET_LJARCH)) 311 ifeq (x64,$(TARGET_LJARCH))
313 TARGET_XLDFLAGS+= -pagezero_size 10000 -image_base 100000000 312 TARGET_XLDFLAGS+= -pagezero_size 10000 -image_base 100000000
314 TARGET_XSHLDFLAGS+= -image_base 7fff04c4a000 313 TARGET_XSHLDFLAGS+= -image_base 7fff04c4a000
@@ -318,7 +317,7 @@ ifeq (iOS,$(TARGET_SYS))
318 TARGET_STRIP+= -x 317 TARGET_STRIP+= -x
319 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 318 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
320 TARGET_DYNXLDOPTS= 319 TARGET_DYNXLDOPTS=
321 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 320 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
322else 321else
323 ifneq (SunOS,$(TARGET_SYS)) 322 ifneq (SunOS,$(TARGET_SYS))
324 ifneq (PS3,$(TARGET_SYS)) 323 ifneq (PS3,$(TARGET_SYS))
@@ -367,10 +366,11 @@ MINILUA_O= host/minilua.o
367MINILUA_LIBS= -lm 366MINILUA_LIBS= -lm
368MINILUA_T= host/minilua 367MINILUA_T= host/minilua
369MINILUA_X= $(MINILUA_T) 368MINILUA_X= $(MINILUA_T)
369MINILUA_DEP=
370 370
371ifeq (,$(HOST_LUA)) 371ifeq (,$(HOST_LUA))
372 HOST_LUA= $(MINILUA_X) 372 HOST_LUA= $(MINILUA_X)
373 DASM_DEP= $(MINILUA_T) 373 MINILUA_DEP= $(MINILUA_T)
374endif 374endif
375 375
376DASM_DIR= ../dynasm 376DASM_DIR= ../dynasm
@@ -445,6 +445,10 @@ endif
445DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) 445DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS)
446DASM_DASC= vm_$(DASM_ARCH).dasc 446DASM_DASC= vm_$(DASM_ARCH).dasc
447 447
448GIT= git
449GIT_RELVER= [ -d ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || :
450GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*)
451
448BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ 452BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \
449 host/buildvm_lib.o host/buildvm_fold.o 453 host/buildvm_lib.o host/buildvm_fold.o
450BUILDVM_T= host/buildvm 454BUILDVM_T= host/buildvm
@@ -488,8 +492,8 @@ LUAJIT_T= luajit
488 492
489ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) 493ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T)
490ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \ 494ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \
491 host/buildvm_arch.h 495 host/buildvm_arch.h luajit.h
492ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) 496ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) luajit_relver.txt $(LIB_VMDEFP)
493WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk 497WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk
494ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) 498ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM)
495 499
@@ -610,7 +614,12 @@ $(MINILUA_T): $(MINILUA_O)
610 $(E) "HOSTLINK $@" 614 $(E) "HOSTLINK $@"
611 $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS) 615 $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS)
612 616
613host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) lj_arch.h lua.h luaconf.h 617luajit.h: $(MINILUA_DEP) $(GIT_DEP) luajit_rolling.h
618 $(E) "VERSION $@"
619 $(Q)$(GIT_RELVER)
620 $(Q)$(HOST_LUA) host/genversion.lua
621
622host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_DEP) lj_arch.h lua.h luaconf.h
614 $(E) "DYNASM $@" 623 $(E) "DYNASM $@"
615 $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC) 624 $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC)
616 625