lua support for x64 as well, and use own lua build

This commit is contained in:
berkeviktor@aol.com 2010-08-12 04:23:51 +02:00
parent 25603820c1
commit 355c3b0a4f
4 changed files with 8 additions and 3 deletions

View File

@ -12,6 +12,9 @@ nmake -f makefile.mak
::cd ..\dns ::cd ..\dns
::nmake -f makefile.mak clean ::nmake -f makefile.mak clean
::nmake -f makefile.mak ::nmake -f makefile.mak
::cd ..\lua
::nmake -f makefile.mak clean
::nmake -f makefile.mak
cd ..\perl cd ..\perl
nmake -f makefile.mak clean nmake -f makefile.mak clean
nmake -f makefile.mak nmake -f makefile.mak

View File

@ -35,6 +35,7 @@ xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ ::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\ewc\xcewc.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\perl\xcperl.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\

View File

@ -1,7 +1,7 @@
include "..\..\src\makeinc.mak" include "..\..\src\makeinc.mak"
xclua.dll: lua.obj lua.def 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 dir xclua.dll
lua.def: lua.def:
@ -10,7 +10,7 @@ lua.def:
echo xchat_plugin_deinit >> lua.def echo xchat_plugin_deinit >> lua.def
lua.obj: lua.c makefile.mak 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: clean:
del *.obj del *.obj

View File

@ -20,6 +20,7 @@ CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64
CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64
LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
LUAPATH = c:\mozilla-build\lua-5.1-x64
PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
PYTHONPATH = c:\mozilla-build\python-2.6-x64 PYTHONPATH = c:\mozilla-build\python-2.6-x64
TCLPATH = c:\mozilla-build\tcl-8.5-x64 TCLPATH = c:\mozilla-build\tcl-8.5-x64
@ -41,7 +42,7 @@ MMX = YES
!endif !endif
############################################################# #############################################################
LUALIB = lua5.1 LUALIB = lua51
LUAOUTPUT = xclua.dll LUAOUTPUT = xclua.dll
PERLLIB = perl510 PERLLIB = perl510