diff options
| author | ruki <[email protected]> | 2020-09-11 22:19:14 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-11 22:19:14 +0800 |
| commit | 3d07635bfab91ae47e1ea08e2e221a4209c6a610 (patch) | |
| tree | 1eee4ef35c37a47732703a7f15f8d0ed1ad1ad8a /core/src/luajit/makefile | |
| parent | 8b50ff7c6583e0ebfb2b249fc4528ca578d0e115 (diff) | |
merge msys and cygwin autogen to windows
Diffstat (limited to 'core/src/luajit/makefile')
| -rw-r--r-- | core/src/luajit/makefile | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile index 1714a2a61..62a485522 100644 --- a/core/src/luajit/makefile +++ b/core/src/luajit/makefile @@ -79,7 +79,7 @@ luajit_C_FILES += \ luajit/src/lj_profile \ luajit/src/lj_prng -# asm files +# is windows? iswin = ifeq ($(PLAT),windows) iswin = yes @@ -91,17 +91,29 @@ ifeq ($(PLAT),cygwin) iswin = yes endif +# autogen plat and arch +GENPLAT := $(PLAT) +GENARCH := $(ARCH) + +# asm files ifdef iswin +ifeq ($(ARCH),x86_64) +GENARCH := x64 +endif +ifeq ($(ARCH),i386) +GENARCH := x86 +endif +GENPLAT := windows luajit_OBJ_FILES += \ - autogen/$(PLAT)/$(luajit_JIT)/$(ARCH)/lj_vm + autogen/$(GENPLAT)/$(luajit_JIT)/$(GENARCH)/lj_vm else luajit_ASM_FILES += \ - autogen/$(PLAT)/$(luajit_JIT)/$(ARCH)/lj_vm + autogen/$(GENPLAT)/$(luajit_JIT)/$(GENARCH)/lj_vm endif # includes luajit_INC_DIRS += \ - autogen/$(PLAT)/$(luajit_JIT)/$(ARCH) + autogen/$(GENPLAT)/$(luajit_JIT)/$(GENARCH) # disable jit compiler ifeq ($(luajit_JIT),nojit) |