[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.59, 1.60 makefile.gcc, 1.59, 1.60 makefile.vc, 1.58, 1.59 makefile.wat, 1.58, 1.59 modules_mod_lua.dsp, 1.23, 1.24

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24926/modules/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
	modules_mod_lua.dsp 
Log Message:
now lua_dll goes in vc_dll; mentioned last changes in changelog

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** makefile.vc	19 Dec 2006 22:24:12 -0000	1.58
--- makefile.vc	20 Dec 2006 16:39:44 -0000	1.59
***************
*** 391,395 ****
  !endif
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! __lua_dll___depname = ..\..\..\lib\vc_lib\lua5.1.dll
  !endif
  !if "$(SHARED)" == "0"
--- 391,395 ----
  !endif
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! __lua_dll___depname = ..\..\..\lib\vc_dll\lua5.1.dll
  !endif
  !if "$(SHARED)" == "0"
***************
*** 628,635 ****
  	-if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	-if exist ..\..\..\lib\vc_lib\lua5.1.lib del ..\..\..\lib\vc_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\vc_lib\lua5.1.dll del ..\..\..\lib\vc_lib\lua5.1.dll
! 	-if exist ..\..\..\lib\vc_lib\lua5.1.ilk del ..\..\..\lib\vc_lib\lua5.1.ilk
! 	-if exist ..\..\..\lib\vc_lib\lua5.1.pdb del ..\..\..\lib\vc_lib\lua5.1.pdb
! 	-if exist ..\..\..\lib\vc_lib\lua5.1.lib del ..\..\..\lib\vc_lib\lua5.1.lib
  	-if exist ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
--- 628,635 ----
  	-if exist vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	-if exist ..\..\..\lib\vc_lib\lua5.1.lib del ..\..\..\lib\vc_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\vc_dll\lua5.1.dll del ..\..\..\lib\vc_dll\lua5.1.dll
! 	-if exist ..\..\..\lib\vc_dll\lua5.1.ilk del ..\..\..\lib\vc_dll\lua5.1.ilk
! 	-if exist ..\..\..\lib\vc_dll\lua5.1.pdb del ..\..\..\lib\vc_dll\lua5.1.pdb
! 	-if exist ..\..\..\lib\vc_dll\lua5.1.lib del ..\..\..\lib\vc_dll\lua5.1.lib
  	-if exist ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
***************
*** 670,676 ****
  
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! ..\..\..\lib\vc_lib\lua5.1.dll: $(LUA_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS)  @<<
! 	$(LUA_DLL_OBJECTS)  /IMPLIB:..\..\..\lib\vc_lib\lua5.1.lib
  <<
  !endif
--- 670,676 ----
  
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! ..\..\..\lib\vc_dll\lua5.1.dll: $(LUA_DLL_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS)  @<<
! 	$(LUA_DLL_OBJECTS)  /IMPLIB:..\..\..\lib\vc_dll\lua5.1.lib
  <<
  !endif

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** makefile.bcc	19 Dec 2006 22:24:12 -0000	1.59
--- makefile.bcc	20 Dec 2006 16:39:44 -0000	1.60
***************
*** 399,403 ****
  !endif
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! __lua_dll___depname = ..\..\..\lib\bcc_lib\lua5.1.dll
  !endif
  !if "$(SHARED)" == "0"
--- 399,403 ----
  !endif
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! __lua_dll___depname = ..\..\..\lib\bcc_dll\lua5.1.dll
  !endif
  !if "$(SHARED)" == "0"
***************
*** 612,622 ****
  	-if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm
  	-if exist ..\..\..\lib\bcc_lib\lua5.1.lib del ..\..\..\lib\bcc_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.dll del ..\..\..\lib\bcc_lib\lua5.1.dll
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.tds del ..\..\..\lib\bcc_lib\lua5.1.tds
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.ilc del ..\..\..\lib\bcc_lib\lua5.1.ilc
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.ild del ..\..\..\lib\bcc_lib\lua5.1.ild
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.ilf del ..\..\..\lib\bcc_lib\lua5.1.ilf
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.ils del ..\..\..\lib\bcc_lib\lua5.1.ils
! 	-if exist ..\..\..\lib\bcc_lib\lua5.1.lib del ..\..\..\lib\bcc_lib\lua5.1.lib
  	-if exist ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
--- 612,622 ----
  	-if exist bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm
  	-if exist ..\..\..\lib\bcc_lib\lua5.1.lib del ..\..\..\lib\bcc_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.dll del ..\..\..\lib\bcc_dll\lua5.1.dll
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.tds del ..\..\..\lib\bcc_dll\lua5.1.tds
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.ilc del ..\..\..\lib\bcc_dll\lua5.1.ilc
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.ild del ..\..\..\lib\bcc_dll\lua5.1.ild
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.ilf del ..\..\..\lib\bcc_dll\lua5.1.ilf
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.ils del ..\..\..\lib\bcc_dll\lua5.1.ils
! 	-if exist ..\..\..\lib\bcc_dll\lua5.1.lib del ..\..\..\lib\bcc_dll\lua5.1.lib
  	-if exist ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
***************
*** 675,683 ****
  
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! ..\..\..\lib\bcc_lib\lua5.1.dll: $(LUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk  @&&|
  	c0d32.obj $(LUA_DLL_OBJECTS),$@,, import32.lib cw32.lib,,
  |
! 	implib -f ..\..\..\lib\bcc_lib\lua5.1 $@
  !endif
  
--- 675,683 ----
  
  !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0"
! ..\..\..\lib\bcc_dll\lua5.1.dll: $(LUA_DLL_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk  @&&|
  	c0d32.obj $(LUA_DLL_OBJECTS),$@,, import32.lib cw32.lib,,
  |
! 	implib -f ..\..\..\lib\bcc_dll\lua5.1 $@
  !endif
  

Index: modules_mod_lua.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua.dsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** modules_mod_lua.dsp	19 Dec 2006 22:24:12 -0000	1.23
--- modules_mod_lua.dsp	20 Dec 2006 16:39:45 -0000	1.24
***************
*** 48,57 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP Target_Dir ""
--- 48,57 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP Target_Dir ""
***************
*** 66,71 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Debug Multilib"
--- 66,71 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Debug Multilib"
***************
*** 73,82 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP Target_Dir ""
--- 73,82 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_uddll\mod_lua"
  # PROP Target_Dir ""
***************
*** 91,96 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Release Monolithic"
--- 91,96 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Release Monolithic"
***************
*** 98,107 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP Target_Dir ""
--- 98,107 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP Target_Dir ""
***************
*** 116,121 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Release Multilib"
--- 116,121 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Unicode Release Multilib"
***************
*** 123,132 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP Target_Dir ""
--- 123,132 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_udll\mod_lua"
  # PROP Target_Dir ""
***************
*** 141,146 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Debug Monolithic"
--- 141,146 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Debug Monolithic"
***************
*** 148,157 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP Target_Dir ""
--- 148,157 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP Target_Dir ""
***************
*** 166,171 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Debug Multilib"
--- 166,171 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Debug Multilib"
***************
*** 173,182 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP Target_Dir ""
--- 173,182 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_ddll\mod_lua"
  # PROP Target_Dir ""
***************
*** 191,196 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Release Monolithic"
--- 191,196 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Release Monolithic"
***************
*** 198,207 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP Target_Dir ""
--- 198,207 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP Target_Dir ""
***************
*** 216,221 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Release Multilib"
--- 216,221 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 DLL Release Multilib"
***************
*** 223,232 ****
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_lib"
  # PROP BASE Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_lib"
  # PROP Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP Target_Dir ""
--- 223,232 ----
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "..\..\..\lib\vc_dll"
  # PROP BASE Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
! # PROP Output_Dir "..\..\..\lib\vc_dll"
  # PROP Intermediate_Dir "vcmsw_dll\mod_lua"
  # PROP Target_Dir ""
***************
*** 241,246 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_lib\lua5.1.dll" /implib:"..\..\..\lib\vc_lib\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 Unicode Debug Monolithic"
--- 241,246 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
! # ADD LINK32 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib"
  
  !ELSEIF  "$(CFG)" == "mod_lua - Win32 Unicode Debug Monolithic"

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** makefile.wat	19 Dec 2006 22:24:12 -0000	1.58
--- makefile.wat	20 Dec 2006 16:39:45 -0000	1.59
***************
*** 118,122 ****
  !ifeq SHARED 1
  !ifeq USE_SYSTEM_LUA 0
! __lua_dll___depname = ..\..\..\lib\wat_lib\lua5.1.dll
  !endif
  !endif
--- 118,122 ----
  !ifeq SHARED 1
  !ifeq USE_SYSTEM_LUA 0
! __lua_dll___depname = ..\..\..\lib\wat_dll\lua5.1.dll
  !endif
  !endif
***************
*** 783,788 ****
  	-if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	-if exist ..\..\..\lib\wat_lib\lua5.1.lib del ..\..\..\lib\wat_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\wat_lib\lua5.1.dll del ..\..\..\lib\wat_lib\lua5.1.dll
! 	-if exist ..\..\..\lib\wat_lib\lua5.1.lib del ..\..\..\lib\wat_lib\lua5.1.lib
  	-if exist ..\..\..\lib\wat_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\wat_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
--- 783,788 ----
  	-if exist watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch
  	-if exist ..\..\..\lib\wat_lib\lua5.1.lib del ..\..\..\lib\wat_lib\lua5.1.lib
! 	-if exist ..\..\..\lib\wat_dll\lua5.1.dll del ..\..\..\lib\wat_dll\lua5.1.dll
! 	-if exist ..\..\..\lib\wat_dll\lua5.1.lib del ..\..\..\lib\wat_dll\lua5.1.lib
  	-if exist ..\..\..\lib\wat_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\wat_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib
  	-if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
***************
*** 813,817 ****
  !ifeq SHARED 1
  !ifeq USE_SYSTEM_LUA 0
! ..\..\..\lib\wat_lib\lua5.1.dll :  $(LUA_DLL_OBJECTS)
  	@%create watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc
  	@%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc option quiet
--- 813,817 ----
  !ifeq SHARED 1
  !ifeq USE_SYSTEM_LUA 0
! ..\..\..\lib\wat_dll\lua5.1.dll :  $(LUA_DLL_OBJECTS)
  	@%create watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc
  	@%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc option quiet
***************
*** 824,828 ****
  	@%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc system nt_dll
  	wlink @watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc
! 	wlib -q -n -b ..\..\..\lib\wat_lib\lua5.1.lib +$^@
  !endif
  !endif
--- 824,828 ----
  	@%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc system nt_dll
  	wlink @watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll.lbc
! 	wlib -q -n -b ..\..\..\lib\wat_dll\lua5.1.lib +$^@
  !endif
  !endif

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** makefile.gcc	19 Dec 2006 22:24:12 -0000	1.59
--- makefile.gcc	20 Dec 2006 16:39:44 -0000	1.60
***************
*** 336,340 ****
  ifeq ($(SHARED),1)
  ifeq ($(USE_SYSTEM_LUA),0)
! __lua_dll___depname = ..\..\..\lib\gcc_lib\lua5.1.dll
  endif
  endif
--- 336,340 ----
  ifeq ($(SHARED),1)
  ifeq ($(USE_SYSTEM_LUA),0)
! __lua_dll___depname = ..\..\..\lib\gcc_dll\lua5.1.dll
  endif
  endif
***************
*** 719,724 ****
  	-if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d
  	-if exist ..\..\..\lib\gcc_lib\liblua5.1.a del ..\..\..\lib\gcc_lib\liblua5.1.a
! 	-if exist ..\..\..\lib\gcc_lib\lua5.1.dll del ..\..\..\lib\gcc_lib\lua5.1.dll
! 	-if exist ..\..\..\lib\gcc_lib\liblua5.1.a del ..\..\..\lib\gcc_lib\liblua5.1.a
  	-if exist ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.a del ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.a
  	-if exist ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
--- 719,724 ----
  	-if exist gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d
  	-if exist ..\..\..\lib\gcc_lib\liblua5.1.a del ..\..\..\lib\gcc_lib\liblua5.1.a
! 	-if exist ..\..\..\lib\gcc_dll\lua5.1.dll del ..\..\..\lib\gcc_dll\lua5.1.dll
! 	-if exist ..\..\..\lib\gcc_dll\liblua5.1.a del ..\..\..\lib\gcc_dll\liblua5.1.a
  	-if exist ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.a del ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.a
  	-if exist ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll
***************
*** 749,754 ****
  ifeq ($(SHARED),1)
  ifeq ($(USE_SYSTEM_LUA),0)
! ..\..\..\lib\gcc_lib\lua5.1.dll: $(LUA_DLL_OBJECTS)
! 	$(CC) -shared -fPIC -o $@ $(LUA_DLL_OBJECTS) $(LDFLAGS) -Wl,--out-implib=..\..\..\lib\gcc_lib\liblua5.1.a
  endif
  endif
--- 749,754 ----
  ifeq ($(SHARED),1)
  ifeq ($(USE_SYSTEM_LUA),0)
! ..\..\..\lib\gcc_dll\lua5.1.dll: $(LUA_DLL_OBJECTS)
! 	$(CC) -shared -fPIC -o $@ $(LUA_DLL_OBJECTS) $(LDFLAGS) -Wl,--out-implib=..\..\..\lib\gcc_dll\liblua5.1.a
  endif
  endif