diff options
| author | Mike Pall <mike> | 2013-05-16 14:40:22 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-16 14:40:22 +0200 |
| commit | 2b94827e1d7f053e7ff0d724644f59a5b8ccff13 (patch) | |
| tree | 49cfe90f401ef3b72b48a610363e5075bc77a81e /src/Makefile | |
| parent | fd616caf2691d8629aa9096216714ba9defd7748 (diff) | |
| parent | 5dabdb2e70799bdd9973495e0e00946e4495eece (diff) | |
| download | luajit-2b94827e1d7f053e7ff0d724644f59a5b8ccff13.tar.gz luajit-2b94827e1d7f053e7ff0d724644f59a5b8ccff13.tar.bz2 luajit-2b94827e1d7f053e7ff0d724644f59a5b8ccff13.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index b9101a74..fa5aed1c 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -479,7 +479,8 @@ TARGET_DEP= $(LIB_VMDEF) $(LUAJIT_SO) | |||
| 479 | 479 | ||
| 480 | ifeq (Windows,$(TARGET_SYS)) | 480 | ifeq (Windows,$(TARGET_SYS)) |
| 481 | TARGET_DYNCC= $(STATIC_CC) | 481 | TARGET_DYNCC= $(STATIC_CC) |
| 482 | LJVM_MODE= coffasm | 482 | LJVM_MODE= peobj |
| 483 | LJVM_BOUT= $(LJVM_O) | ||
| 483 | LUAJIT_T= luajit.exe | 484 | LUAJIT_T= luajit.exe |
| 484 | ifeq (cygwin,$(HOST_MSYS)) | 485 | ifeq (cygwin,$(HOST_MSYS)) |
| 485 | LUAJIT_SO= cyg$(TARGET_DLLNAME) | 486 | LUAJIT_SO= cyg$(TARGET_DLLNAME) |