diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-12 04:23:51 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-12 04:23:51 +0200 |
| commit | 355c3b0a4ff1addb7912ad3ed40c72e64de0b0b3 (patch) | |
| tree | ef2223d0f9cfd47a81f2c92db16f624155148057 | |
| parent | 25603820c1fd7c12bbcaec98a36ad6dd8162b497 (diff) | |
lua support for x64 as well, and use own lua build
| -rw-r--r-- | build/build-x64.bat | 3 | ||||
| -rw-r--r-- | build/release-x64.bat | 1 | ||||
| -rw-r--r-- | plugins/lua/makefile.mak | 4 | ||||
| -rw-r--r-- | src/makeinc.mak | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat index 5f064bba..13f72a84 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -12,6 +12,9 @@ nmake -f makefile.mak ::cd ..\dns ::nmake -f makefile.mak clean ::nmake -f makefile.mak +::cd ..\lua +::nmake -f makefile.mak clean +::nmake -f makefile.mak cd ..\perl nmake -f makefile.mak clean nmake -f makefile.mak diff --git a/build/release-x64.bat b/build/release-x64.bat index 1106bb58..e3ebb391 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -35,6 +35,7 @@ xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% ::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ +::xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak index a63eebe2..2b9a18ee 100644 --- a/plugins/lua/makefile.mak +++ b/plugins/lua/makefile.mak @@ -1,7 +1,7 @@ include "..\..\src\makeinc.mak" xclua.dll: lua.obj lua.def - link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /LIBPATH:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj + link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /LIBPATH:$(LUAPATH) $(LUALIB).lib /def:lua.def lua.obj dir xclua.dll lua.def: @@ -10,7 +10,7 @@ lua.def: echo xchat_plugin_deinit >> lua.def lua.obj: lua.c makefile.mak - cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH)\include /I.. lua.c + cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH) /I.. lua.c clean: del *.obj diff --git a/src/makeinc.mak b/src/makeinc.mak index 08700b6a..e1204c2b 100644 --- a/src/makeinc.mak +++ b/src/makeinc.mak @@ -20,6 +20,7 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj +LUAPATH = c:\mozilla-build\lua-5.1-x64 PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE PYTHONPATH = c:\mozilla-build\python-2.6-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64 @@ -41,7 +42,7 @@ MMX = YES !endif ############################################################# -LUALIB = lua5.1 +LUALIB = lua51 LUAOUTPUT = xclua.dll PERLLIB = perl510 |