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 aac78beb..e6954a95 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | MAJVER= 2 | 13 | MAJVER= 2 |
14 | MINVER= 0 | 14 | MINVER= 0 |
15 | RELVER= 5 | ||
16 | ABIVER= 5.1 | 15 | ABIVER= 5.1 |
17 | NODOTABIVER= 51 | 16 | NODOTABIVER= 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 |
322 | else | 321 | else |
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 | |||
367 | MINILUA_LIBS= -lm | 366 | MINILUA_LIBS= -lm |
368 | MINILUA_T= host/minilua | 367 | MINILUA_T= host/minilua |
369 | MINILUA_X= $(MINILUA_T) | 368 | MINILUA_X= $(MINILUA_T) |
369 | MINILUA_DEP= | ||
370 | 370 | ||
371 | ifeq (,$(HOST_LUA)) | 371 | ifeq (,$(HOST_LUA)) |
372 | HOST_LUA= $(MINILUA_X) | 372 | HOST_LUA= $(MINILUA_X) |
373 | DASM_DEP= $(MINILUA_T) | 373 | MINILUA_DEP= $(MINILUA_T) |
374 | endif | 374 | endif |
375 | 375 | ||
376 | DASM_DIR= ../dynasm | 376 | DASM_DIR= ../dynasm |
@@ -445,6 +445,10 @@ endif | |||
445 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) | 445 | DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS) |
446 | DASM_DASC= vm_$(DASM_ARCH).dasc | 446 | DASM_DASC= vm_$(DASM_ARCH).dasc |
447 | 447 | ||
448 | GIT= git | ||
449 | GIT_RELVER= [ -d ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || : | ||
450 | GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*) | ||
451 | |||
448 | BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \ | 452 | BUILDVM_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 |
450 | BUILDVM_T= host/buildvm | 454 | BUILDVM_T= host/buildvm |
@@ -488,8 +492,8 @@ LUAJIT_T= luajit | |||
488 | 492 | ||
489 | ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) | 493 | ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) |
490 | ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \ | 494 | ALL_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 |
492 | ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) | 496 | ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) luajit_relver.txt $(LIB_VMDEFP) |
493 | WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk | 497 | WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk |
494 | ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) | 498 | ALL_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 | ||
613 | host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) lj_arch.h lua.h luaconf.h | 617 | luajit.h: $(MINILUA_DEP) $(GIT_DEP) luajit_rolling.h |
618 | $(E) "VERSION $@" | ||
619 | $(Q)$(GIT_RELVER) | ||
620 | $(Q)$(HOST_LUA) host/genversion.lua | ||
621 | |||
622 | host/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 | ||