diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 10:58:50 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2014-10-14 10:58:50 +0200 |
| commit | 0b3f1a0e088575988beaaea11b3e32a0bd26f63a (patch) | |
| tree | 6d19a10e4280d127e06409be785faa9e5450ec9a /makefiles | |
| parent | c53b92a2da701e0ae8c0263ab92344dd418558c2 (diff) | |
| download | crawler-0b3f1a0e088575988beaaea11b3e32a0bd26f63a.tar.gz crawler-0b3f1a0e088575988beaaea11b3e32a0bd26f63a.tar.bz2 | |
tolua test runs on Windows
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/gmake/platform.mk | 3 | ||||
| -rwxr-xr-x | makefiles/nmake/config.mk | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index 7c53844..8e99baa 100644 --- a/makefiles/gmake/platform.mk +++ b/makefiles/gmake/platform.mk @@ -364,8 +364,9 @@ endif ifeq ($(WITH_LUA),1) TOLUA_DIR = $(TOPDIR)/tolua +LUA_DIR = $(TOPDIR)/lua TOLUA = $(TOLUA_DIR)/bin/tolua -TOLUA_INCLUDES = -I$(TOLUA_DIR)/include +TOLUA_INCLUDES = -I$(TOLUA_DIR)/include -I$(LUA_DIR)/src TOLUA_LDFLAGS = TOLUA_LIBS = $(TOLUA_DIR)/lib/libtolua.a endif diff --git a/makefiles/nmake/config.mk b/makefiles/nmake/config.mk index 5593036..cb15837 100755 --- a/makefiles/nmake/config.mk +++ b/makefiles/nmake/config.mk @@ -68,3 +68,15 @@ DOXYGEN = C:\Program Files\Doxygen\bin\doxygen.exe ########################################################################## HHC_LOCATION = C:\Program Files\HTML Help Workshop\hhc.exe + +# tolua and Lua +############### + +TOLUA_DIR = $(TOPDIR)\tolua +LUA_DIR = $(TOPDIR)\lua +TOLUA = $(TOLUA_DIR)\bin\tolua +TOLUA_CFLAGS = /DSHARED /DLUA_LIB +TOLUA_INCLUDES = /I$(TOLUA_DIR)\include /I$(LUA_DIR)\src +TOLUA_LDFLAGS = +TOLUA_LIBS = $(TOLUA_DIR)\lib\tolua.lib $(LUA_DIR)\src\lua52.lib + |