diff options
| author | Mike Pall <mike> | 2015-06-09 21:56:58 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-06-09 22:08:40 +0200 |
| commit | 72347895edbdc8730c1e758bfee4264fd60164ac (patch) | |
| tree | 0bf8807df7f58ad461da389f44c71d5fd179bec9 /src/Makefile | |
| parent | 69e5342eb893815b18a1ec84ba74b0e0d1cc9beb (diff) | |
| download | luajit2-72347895edbdc8730c1e758bfee4264fd60164ac.tar.gz | |
x64: Allow building without external unwinder.
Required for PS4 SDK 2.5. Thanks to James Park.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 1d38fa25..5021e479 100644 --- a/src/Makefile +++ b/src/Makefile @@ -243,9 +243,6 @@ ifneq (,$(findstring LJ_TARGET_PS3 1,$(TARGET_TESTARCH))) TARGET_ARCH+= -D__CELLOS_LV2__ TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC endif -ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) - TARGET_ARCH+= -DLUAJIT_NO_UNWIND -endif TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) @@ -397,6 +394,10 @@ ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH))) else TARGET_ARCH+= -DLJ_ABI_SOFTFP=1 endif +ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) + DASM_AFLAGS+= -D NO_UNWIND + TARGET_ARCH+= -DLUAJIT_NO_UNWIND +endif DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) ifeq (Windows,$(TARGET_SYS)) DASM_AFLAGS+= -D WIN |