diff options
| author | Benoit Germain <bnt.germain@gmail.com> | 2020-04-22 11:26:16 +0200 |
|---|---|---|
| committer | Benoit Germain <bnt.germain@gmail.com> | 2020-04-22 11:26:16 +0200 |
| commit | a24e54d7d506d4ac38516143b25593922a9959cf (patch) | |
| tree | 43be32f77cdb0c29128fa5c95af3d8d3b06dc26f | |
| parent | 237c642fb50ee0d4c777fc9cd0e7a5b0ead7cabd (diff) | |
| download | lanes-a24e54d7d506d4ac38516143b25593922a9959cf.tar.gz lanes-a24e54d7d506d4ac38516143b25593922a9959cf.tar.bz2 lanes-a24e54d7d506d4ac38516143b25593922a9959cf.zip | |
Makefile detect MinGW 64 as well as MinGW 32
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
| @@ -20,8 +20,8 @@ N=1000 | |||
| 20 | _TARGET_DIR=src/lanes | 20 | _TARGET_DIR=src/lanes |
| 21 | TIME=time | 21 | TIME=time |
| 22 | 22 | ||
| 23 | ifeq "$(findstring MINGW32,$(shell uname -s))" "MINGW32" | 23 | ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW" |
| 24 | # MinGW MSYS on XP | 24 | # MinGW MSYS on Windows |
| 25 | # | 25 | # |
| 26 | _SO=dll | 26 | _SO=dll |
| 27 | _LUAEXT=.exe | 27 | _LUAEXT=.exe |
diff --git a/src/Makefile b/src/Makefile index 9dc75a1..8729c29 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -19,12 +19,12 @@ OPT_FLAGS=-O2 | |||
| 19 | # -O0 -g | 19 | # -O0 -g |
| 20 | 20 | ||
| 21 | _SO=so | 21 | _SO=so |
| 22 | ifeq "$(findstring MINGW32,$(shell uname -s))" "MINGW32" | 22 | ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW" |
| 23 | _SO=dll | 23 | _SO=dll |
| 24 | endif | 24 | endif |
| 25 | 25 | ||
| 26 | ifeq "$(LUAROCKS)" "" | 26 | ifeq "$(LUAROCKS)" "" |
| 27 | ifeq "$(findstring MINGW32,$(shell uname -s))" "MINGW32" | 27 | ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW" |
| 28 | # MinGW MSYS on Windows | 28 | # MinGW MSYS on Windows |
| 29 | # | 29 | # |
| 30 | # - 'lua' and 'luac' expected to be on the path | 30 | # - 'lua' and 'luac' expected to be on the path |