diff options
| author | ruki <[email protected]> | 2021-03-25 00:02:28 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-24 18:15:22 +0800 |
| commit | e62ee28ef645169cf5a71582b1dfc0db039bc8ed (patch) | |
| tree | e36750c534546eae4c607cbfea48f567103336c5 /core/makefile | |
| parent | 8936f11d510960caacf1fa8bcead1bedbef6a964 (diff) | |
add iphoneos support
Diffstat (limited to 'core/makefile')
| -rw-r--r-- | core/makefile | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/core/makefile b/core/makefile index 9b596690d..1a9017980 100644 --- a/core/makefile +++ b/core/makefile @@ -53,24 +53,12 @@ install : .null +@$(MAKE) --no-print-directory -C $(SRC_DIR) +@$(MAKE) --no-print-directory -C $(SRC_DIR) install -# make lipo -lipo : .null - ./tool/lipo $(PRO_NAME) $(DEBUG) $(SDK) $(ARCH1) $(ARCH2) - # make clean clean : .null @echo "" > $(TMP_DIR)/$(PRO_NAME).out @echo clean $(PRO_NAME) +@$(MAKE) --no-print-directory -C $(SRC_DIR) clean -# make update -update : .null - @echo "" > $(TMP_DIR)/$(PRO_NAME).out - @echo update $(PRO_NAME) - @$(MAKE) --no-print-directory -C $(SRC_DIR) update - @$(MAKE) --no-print-directory -C $(SRC_DIR) - @$(MAKE) --no-print-directory -C $(SRC_DIR) install - # make output output : .null @echo output $(PRO_NAME) @@ -171,7 +159,7 @@ BUILD_ARCH :=$(if $(findstring cygwin,$(PLAT)),x$(shell getconf LONG_BIT),$(BUI BUILD_ARCH :=$(if $(findstring macosx,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring linux,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring bsd,$(PLAT)),x$(shell getconf LONG_BIT),$(BUILD_ARCH)) -BUILD_ARCH :=$(if $(findstring iphoneos,$(PLAT)),armv7,$(BUILD_ARCH)) +BUILD_ARCH :=$(if $(findstring iphoneos,$(PLAT)),arm64,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring i686,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring x32,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) @@ -313,6 +301,9 @@ endif else luajit_JIT :=jit endif +ifeq ($(PLAT),iphoneos) +luajit_JIT :=nojit +endif # select package directory ifneq ($(PACKAGE),) |