diff options
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))) | |||
| 243 | TARGET_ARCH+= -D__CELLOS_LV2__ | 243 | TARGET_ARCH+= -D__CELLOS_LV2__ |
| 244 | TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC | 244 | TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC |
| 245 | endif | 245 | endif |
| 246 | ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) | ||
| 247 | TARGET_ARCH+= -DLUAJIT_NO_UNWIND | ||
| 248 | endif | ||
| 249 | 246 | ||
| 250 | TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) | 247 | TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) |
| 251 | TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) | 248 | TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) |
| @@ -397,6 +394,10 @@ ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH))) | |||
| 397 | else | 394 | else |
| 398 | TARGET_ARCH+= -DLJ_ABI_SOFTFP=1 | 395 | TARGET_ARCH+= -DLJ_ABI_SOFTFP=1 |
| 399 | endif | 396 | endif |
| 397 | ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) | ||
| 398 | DASM_AFLAGS+= -D NO_UNWIND | ||
| 399 | TARGET_ARCH+= -DLUAJIT_NO_UNWIND | ||
| 400 | endif | ||
| 400 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) | 401 | DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH)))) |
| 401 | ifeq (Windows,$(TARGET_SYS)) | 402 | ifeq (Windows,$(TARGET_SYS)) |
| 402 | DASM_AFLAGS+= -D WIN | 403 | DASM_AFLAGS+= -D WIN |
