diff options
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index cc520fc8..3a6a4329 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | MAJVER= 2 | 13 | MAJVER= 2 |
14 | MINVER= 1 | 14 | MINVER= 1 |
15 | RELVER= 0 | ||
16 | ABIVER= 5.1 | 15 | ABIVER= 5.1 |
17 | NODOTABIVER= 51 | 16 | NODOTABIVER= 51 |
18 | 17 | ||
@@ -323,13 +322,13 @@ ifeq (Darwin,$(TARGET_SYS)) | |||
323 | TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL | 322 | TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL |
324 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC | 323 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC |
325 | TARGET_DYNXLDOPTS= | 324 | TARGET_DYNXLDOPTS= |
326 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) | 325 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255 |
327 | else | 326 | else |
328 | ifeq (iOS,$(TARGET_SYS)) | 327 | ifeq (iOS,$(TARGET_SYS)) |
329 | TARGET_STRIP+= -x | 328 | TARGET_STRIP+= -x |
330 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC | 329 | TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC |
331 | TARGET_DYNXLDOPTS= | 330 | TARGET_DYNXLDOPTS= |
332 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) | 331 | TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255 |
333 | ifeq (arm64,$(TARGET_LJARCH)) | 332 | ifeq (arm64,$(TARGET_LJARCH)) |
334 | TARGET_XCFLAGS+= -fno-omit-frame-pointer | 333 | TARGET_XCFLAGS+= -fno-omit-frame-pointer |
335 | endif | 334 | endif |
@@ -388,10 +387,11 @@ MINILUA_O= host/minilua.o | |||
388 | MINILUA_LIBS= -lm | 387 | MINILUA_LIBS= -lm |
389 | MINILUA_T= host/minilua | 388 | MINILUA_T= host/minilua |
390 | MINILUA_X= $(MINILUA_T) | 389 | MINILUA_X= $(MINILUA_T) |
390 | MINILUA_DEP= | ||
391 | 391 | ||
392 | ifeq (,$(HOST_LUA)) | 392 | ifeq (,$(HOST_LUA)) |
393 | HOST_LUA= $(MINILUA_X) | 393 | HOST_LUA= $(MINILUA_X) |
394 | DASM_DEP= $(MINILUA_T) | 394 | MINILUA_DEP= $(MINILUA_T) |
395 | endif | 395 | endif |
396 | 396 | ||
397 | DASM_DIR= ../dynasm | 397 | DASM_DIR= ../dynasm |
@@ -474,6 +474,10 @@ endif | |||
474 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) | 474 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) |
475 | DASM_DASC= vm_$(DASM_ARCH).dasc | 475 | DASM_DASC= vm_$(DASM_ARCH).dasc |
476 | 476 | ||
477 | GIT= git | ||
478 | GIT_RELVER= [ -d ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : | ||
479 | GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) | ||
480 | |||
477 | BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ | 481 | BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ |
478 | host/buildvm_lib.o host/buildvm_fold.o | 482 | host/buildvm_lib.o host/buildvm_fold.o |
479 | BUILDVM_T= host/buildvm | 483 | BUILDVM_T= host/buildvm |
@@ -520,8 +524,8 @@ LUAJIT_T= luajit | |||
520 | 524 | ||
521 | ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) | 525 | ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) |
522 | ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \ | 526 | ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \ |
523 | host/buildvm_arch.h | 527 | host/buildvm_arch.h luajit.h |
524 | ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) | 528 | ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) luajit_relver.txt $(LIB_VMDEFP) |
525 | WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk | 529 | WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk |
526 | ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) | 530 | ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) |
527 | 531 | ||
@@ -645,7 +649,12 @@ $(MINILUA_T): $(MINILUA_O) | |||
645 | $(E) "HOSTLINK $@" | 649 | $(E) "HOSTLINK $@" |
646 | $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS) | 650 | $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS) |
647 | 651 | ||
648 | host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) $(DASM_DIR)/*.lua lj_arch.h lua.h luaconf.h | 652 | luajit.h: $(MINILUA_DEP) $(GIT_DEP) luajit_rolling.h |
653 | $(E) "VERSION $@" | ||
654 | $(Q)$(GIT_RELVER) | ||
655 | $(Q)$(HOST_LUA) host/genversion.lua | ||
656 | |||
657 | host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_DEP) lj_arch.h lua.h luaconf.h | ||
649 | $(E) "DYNASM $@" | 658 | $(E) "DYNASM $@" |
650 | $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC) | 659 | $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC) |
651 | 660 | ||