aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Germain <bnt.germain@gmail.com>2012-08-14 22:00:47 +0200
committerBenoit Germain <bnt.germain@gmail.com>2012-08-14 22:00:47 +0200
commit7767a0133c5c8945a887b06061aae332446f37bb (patch)
tree4e0d6feefb7e4fdfcd45f36641da2ca0bcc3cc4a
parent88d8305ebddeb59cd7cf243869f063aa8aab3c39 (diff)
downloadlanes-7767a0133c5c8945a887b06061aae332446f37bb.tar.gz
lanes-7767a0133c5c8945a887b06061aae332446f37bb.tar.bz2
lanes-7767a0133c5c8945a887b06061aae332446f37bb.zip
* removed the search for MSVCR80.DLL when building for MinGW32 since it no longer seems to be necessary
-rw-r--r--src/Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile
index a16acce..c6ab644 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,15 +36,8 @@ ifeq "$(LUAROCKS)" ""
36 ifeq "$(LUA_DEV)" "" 36 ifeq "$(LUA_DEV)" ""
37 $(error LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1') 37 $(error LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1')
38 endif 38 endif
39 ifeq "$(MSVCR80)" ""
40 MSVCR80:=$(LUA_DEV)/install/support/Microsoft.VC80.CRT.SP1/MSVCR80.DLL
41 ifneq '$(shell test -f "$(MSVCR80)" && echo found)' 'found'
42 $(error MSVCR80 not defined - set it to full path of msvcr80.dll')
43 endif
44 $(warning MSVCR80=$(MSVCR80))
45 endif
46 LUA_FLAGS:=-I "$(LUA_DEV)/include" 39 LUA_FLAGS:=-I "$(LUA_DEV)/include"
47 LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc -lmsvcr80 "$(MSVCR80)" 40 LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
48 LIBFLAG=-shared -Wl,-Map,lanes.map 41 LIBFLAG=-shared -Wl,-Map,lanes.map
49 else 42 else
50 # Autodetect LUA_FLAGS and/or LUA_LIBS 43 # Autodetect LUA_FLAGS and/or LUA_LIBS