Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:57
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/apps/build/msw Modified Files: apps.dsw apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Added Files: apps_app_verbatimlua.dsp Removed Files: apps_app_lua.dsp Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** apps.dsw 8 Dec 2006 13:19:57 -0000 1.12 --- apps.dsw 10 Dec 2006 00:47:21 -0000 1.13 *************** *** 3,7 **** ############################################################################### ! Project: "app_lua"=apps_app_lua.dsp - Package Owner=<4> Package=<5> --- 3,7 ---- ############################################################################### ! Project: "app_verbatimlua"=apps_app_verbatimlua.dsp - Package Owner=<4> Package=<5> Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** makefile.bcc 8 Dec 2006 13:19:57 -0000 1.52 --- makefile.bcc 10 Dec 2006 00:47:22 -0000 1.53 *************** *** 138,142 **** ### Variables: ### ! APP_LUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 138,142 ---- ### Variables: ### ! APP_VERBATIMLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ *************** *** 144,149 **** -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ $(CFLAGS) ! APP_LUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 144,149 ---- -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ $(CFLAGS) ! APP_VERBATIMLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_verbatimlua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 404,410 **** -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils ! ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | --- 404,410 ---- -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils ! ..\..\..\bin\wxlua-lua.exe: $(APP_VERBATIMLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| ! c0x32.obj $(APP_VERBATIMLUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | *************** *** 412,416 **** ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 412,416 ---- ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 419,423 **** ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 419,423 ---- ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 426,430 **** ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 426,430 ---- ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 433,442 **** ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c ! $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp --- 433,442 ---- ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_verbatimlua_lua.obj: ..\..\..\modules\lua\src\lua.c ! $(CC) -q -c -P- -o$@ $(APP_VERBATIMLUA_CFLAGS) $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** apps_app_wxlua.dsp 8 Dec 2006 13:19:57 -0000 1.26 --- apps_app_wxlua.dsp 10 Dec 2006 00:47:21 -0000 1.27 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Monolithic" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Multilib" *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release Monolithic" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release Multilib" *************** *** 341,346 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug Monolithic" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug Multilib" *************** *** 391,396 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release Monolithic" --- 391,396 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release Monolithic" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release Multilib" --- 416,421 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release Multilib" *************** *** 441,446 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib lua5.1.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF --- 441,446 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF --- NEW FILE: apps_app_verbatimlua.dsp --- # Microsoft Developer Studio Project File - Name="apps_app_verbatimlua" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=app_verbatimlua - Win32 Release Multilib !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "apps_app_verbatimlua.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "apps_app_verbatimlua.mak" CFG="app_verbatimlua - Win32 Release Multilib" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "app_verbatimlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Unicode Release Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Unicode Release Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Debug Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Debug Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Release Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 DLL Release Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_verbatimlua - Win32 Unicode Debug Monoli... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:57
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209 Modified Files: configure Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** configure 8 Dec 2006 13:19:56 -0000 1.40 --- configure 10 Dec 2006 00:47:20 -0000 1.41 *************** *** 6812,6815 **** --- 6812,6820 ---- + + + + + # check for STC wrapper for wxWidgets if [ "$USE_WXBINDSTC" = "1" ]; then *************** *** 6998,7001 **** --- 7003,7023 ---- + WXLIKE_LIBNAME="wx""_""$WX_PORT" + + if test "$WX_PORT" = "gtk"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""$WX_GTKPORT_VERSION" + fi + + if test "$WX_UNICODE" = "1"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""u" + fi + if test "$WX_DEBUG" = "1"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""d" + fi + + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""_""stedit""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" + + + major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` *************** *** 7018,7022 **** CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS="$LIBS -lstedit $WX_LIBS" if test -z "$COMPCHECK_MSG"; then --- 7040,7044 ---- CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS="$LIBS -l$WXLIKE_LIBNAME $WX_LIBS" if test -z "$COMPCHECK_MSG"; then *************** *** 9568,9572 **** # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! if [ ! -z "$srcdir" ]; then { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5 --- 9590,9594 ---- # the wx.so library in ../lib; thus we need to copy the sample(s) to the # build directory to preserve the relative path correctness ! if [ "$top_srcdir" != "." ]; then { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5 |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:30
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** common.bkl 8 Dec 2006 13:19:59 -0000 1.6 --- common.bkl 10 Dec 2006 00:47:23 -0000 1.7 *************** *** 37,41 **** --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> - <!-- <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> --> <!-- top_builddir already ends with '/' --> --- 37,40 ---- Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** modules.bkl 8 Dec 2006 13:19:59 -0000 1.38 --- modules.bkl 10 Dec 2006 00:47:23 -0000 1.39 *************** *** 54,58 **** <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> <module-name>LUA</module-name> - <libname>lua5.1</libname> <!-- see options.bkl for these --> --- 54,57 ---- *************** *** 62,67 **** <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> <module-name>LUA</module-name> - <libname>lua5.1</libname> - <dllname>lua5.1</dllname> <if cond="TARGETING_WIN32=='1'"> --- 61,64 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:30
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/modules Modified Files: Makefile.in Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Makefile.in 9 Dec 2006 21:09:06 -0000 1.48 --- Makefile.in 10 Dec 2006 00:47:22 -0000 1.49 *************** *** 333,338 **** @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_1_WX_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_SHARED_0@__verbatimlua_lib___depname = \ ! @COND_SHARED_0@ $(top_builddir)/lib/$(LIBPREFIX)lua5.1$(LIBEXT) @COND_SHARED_0@__install_verbatimlua_lib___depname = \ @COND_SHARED_0@ install_verbatimlua_lib --- 333,339 ---- @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_1_WX_UNICODE_1@WXLIBPOSTFIX = ud ! COND_SHARED_0___verbatimlua_lib___depname = \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! @COND_SHARED_0@__verbatimlua_lib___depname = $(COND_SHARED_0___verbatimlua_lib___depname) @COND_SHARED_0@__install_verbatimlua_lib___depname = \ @COND_SHARED_0@ install_verbatimlua_lib *************** *** 343,389 **** @COND_SHARED_0@__uninstall_verbatimlua_lib_headers___depname \ @COND_SHARED_0@ = uninstall_verbatimlua_lib_headers ! @COND_SHARED_1@__verbatimlua_dll___depname = \ ! @COND_SHARED_1@ $(top_builddir)/lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) ! @COND_USE_SOVERLINUX_1@__verbatimlua_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(dll___targetsuf2) ! @COND_USE_SOVERSOLARIS_1@__verbatimlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)lua5.1$(dll___targetsuf3) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf3) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2) \ ! $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf3) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2); $(LN_S) \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2) $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_inst_cmd) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd = rm -f \ ! $(DLLPREFIX)lua5.1$(dll___targetsuf2) $(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd) @COND_SHARED_1@__install_verbatimlua_dll___depname = \ @COND_SHARED_1@ install_verbatimlua_dll @COND_SHARED_1@__uninstall_verbatimlua_dll___depname = \ @COND_SHARED_1@ uninstall_verbatimlua_dll ! @COND_PLATFORM_MACOSX_1@__verbatimlua_dll___macinstnamecmd \ ! @COND_PLATFORM_MACOSX_1@ = -install_name \ ! @COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)lua5.1$(dll___targetsuf2) @COND_SHARED_1@__install_verbatimlua_dll_headers___depname = \ @COND_SHARED_1@ install_verbatimlua_dll_headers @COND_SHARED_1@__uninstall_verbatimlua_dll_headers___depname \ @COND_SHARED_1@ = uninstall_verbatimlua_dll_headers - @COND_PLATFORM_OS2_1@__verbatimlua_dll___importlib = \ - @COND_PLATFORM_OS2_1@ -import \ - @COND_PLATFORM_OS2_1@ $(top_builddir)/lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) - @COND_WINDOWS_IMPLIB_1@__verbatimlua_dll___importlib \ - @COND_WINDOWS_IMPLIB_1@ = \ - @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) COND_SHARED_0___wxlua_lib___depname = \ $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) --- 344,398 ---- @COND_SHARED_0@__uninstall_verbatimlua_lib_headers___depname \ @COND_SHARED_0@ = uninstall_verbatimlua_lib_headers ! COND_SHARED_1___verbatimlua_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! @COND_SHARED_1@__verbatimlua_dll___depname = $(COND_SHARED_1___verbatimlua_dll___depname) ! COND_USE_SOVERLINUX_1___verbatimlua_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) ! @COND_USE_SOVERLINUX_1@__verbatimlua_dll___soname_flags = $(COND_USE_SOVERLINUX_1___verbatimlua_dll___soname_flags) ! COND_USE_SOVERSOLARIS_1___verbatimlua_dll___soname_flags = \ ! $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! @COND_USE_SOVERSOLARIS_1@__verbatimlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___verbatimlua_dll___soname_flags) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ ! $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ ! $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ ! $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ ! $(LN_S) \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_inst_cmd) COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd = rm -f \ ! $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd) + COND_PLATFORM_OS2_1___verbatimlua_dll___importlib = -import \ + $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_PLATFORM_OS2_1@__verbatimlua_dll___importlib = $(COND_PLATFORM_OS2_1___verbatimlua_dll___importlib) + COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib = \ + -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_WINDOWS_IMPLIB_1@__verbatimlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib) @COND_SHARED_1@__install_verbatimlua_dll___depname = \ @COND_SHARED_1@ install_verbatimlua_dll @COND_SHARED_1@__uninstall_verbatimlua_dll___depname = \ @COND_SHARED_1@ uninstall_verbatimlua_dll ! COND_PLATFORM_MACOSX_1___verbatimlua_dll___macinstnamecmd = -install_name \ ! $(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) ! @COND_PLATFORM_MACOSX_1@__verbatimlua_dll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___verbatimlua_dll___macinstnamecmd) @COND_SHARED_1@__install_verbatimlua_dll_headers___depname = \ @COND_SHARED_1@ install_verbatimlua_dll_headers @COND_SHARED_1@__uninstall_verbatimlua_dll_headers___depname \ @COND_SHARED_1@ = uninstall_verbatimlua_dll_headers COND_SHARED_0___wxlua_lib___depname = \ $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) *************** *** 720,724 **** install-strip: install ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) --- 729,733 ---- install-strip: install ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) *************** *** 731,738 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/lib/$(LIBPREFIX)lua5.1$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)lua5.1$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) --- 740,747 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) *************** *** 760,764 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_SHARED_0@$(top_builddir)/lib/$(LIBPREFIX)lua5.1$(LIBEXT): $(VERBATIMLUA_LIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(VERBATIMLUA_LIB_OBJECTS) --- 769,773 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_SHARED_0@$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(VERBATIMLUA_LIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) $(AROPTIONS) $@ $(VERBATIMLUA_LIB_OBJECTS) *************** *** 767,774 **** @COND_SHARED_0@install_verbatimlua_lib: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)lua5.1$(LIBEXT) $(DESTDIR)$(libdir) @COND_SHARED_0@uninstall_verbatimlua_lib: ! @COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)lua5.1$(LIBEXT) @COND_SHARED_0@install_verbatimlua_lib_headers: --- 776,783 ---- @COND_SHARED_0@install_verbatimlua_lib: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) @COND_SHARED_0@uninstall_verbatimlua_lib: ! @COND_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) @COND_SHARED_0@install_verbatimlua_lib_headers: *************** *** 786,791 **** @COND_SHARED_0@ done ! @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3): $(VERBATIMLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CC) $@ $(VERBATIMLUA_DLL_OBJECTS) $(LDFLAGS) $(__verbatimlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__verbatimlua_dll___macinstnamecmd) $(__verbatimlua_dll___importlib) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__verbatimlua_dll___so_symlinks_cmd) --- 795,800 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(VERBATIMLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CC) $@ $(VERBATIMLUA_DLL_OBJECTS) $(LDFLAGS) $(__verbatimlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__verbatimlua_dll___importlib) $(__verbatimlua_dll___macinstnamecmd) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__verbatimlua_dll___so_symlinks_cmd) *************** *** 793,803 **** @COND_SHARED_1@install_verbatimlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)lua5.1$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_verbatimlua_dll: ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)lua5.1.$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)lua5.1$(dll___targetsuf3) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_uninst_cmd)) --- 802,812 ---- @COND_SHARED_1@install_verbatimlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_inst_cmd)) @COND_SHARED_1@uninstall_verbatimlua_dll: ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_uninst_cmd)) *************** *** 843,847 **** @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) --- 852,856 ---- @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUA_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) *************** *** 899,903 **** @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBIND_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) --- 908,912 ---- @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBIND_DLL_OBJECTS) ! @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ @COND_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) *************** *** 955,959 **** @COND_SHARED_1_USE_WXBINDSTC_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) --- 964,968 ---- @COND_SHARED_1_USE_WXBINDSTC_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) *************** *** 1011,1015 **** @COND_SHARED_1_USE_WXLUADEBUG_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluadebug_dll___importlib) $(__wxluadebug_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_WXLUADEBUG_1@ @COND_SHARED_1_USE_WXLUADEBUG_1@ $(__wxluadebug_dll___so_symlinks_cmd) --- 1020,1024 ---- @COND_SHARED_1_USE_WXLUADEBUG_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluadebug_dll___importlib) $(__wxluadebug_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUADEBUG_1@ @COND_SHARED_1_USE_WXLUADEBUG_1@ $(__wxluadebug_dll___so_symlinks_cmd) *************** *** 1067,1071 **** @COND_SHARED_1_USE_WXLUASOCKET_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluasocket_dll___importlib) $(__wxluasocket_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(__wxluasocket_dll___so_symlinks_cmd) --- 1076,1080 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluasocket_dll___importlib) $(__wxluasocket_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(__wxluasocket_dll___so_symlinks_cmd) |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:29
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_verbatimlua.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** makefile.bcc 9 Dec 2006 21:09:06 -0000 1.53 --- makefile.bcc 10 Dec 2006 00:47:23 -0000 1.54 *************** *** 376,383 **** !endif !if "$(SHARED)" == "0" ! __verbatimlua_lib___depname = ..\..\..\lib\bcc_lib\lua5.1.lib !endif !if "$(SHARED)" == "1" ! __verbatimlua_dll___depname = ..\..\..\lib\bcc_dll\lua5.1.dll !endif !if "$(SHARED)" == "0" --- 376,385 ---- !endif !if "$(SHARED)" == "0" ! __verbatimlua_lib___depname = \ ! ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib !endif !if "$(SHARED)" == "1" ! __verbatimlua_dll___depname = \ ! ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.dll !endif !if "$(SHARED)" == "0" *************** *** 591,602 **** -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(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 --- 593,604 ---- -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib del ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.dll del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.dll ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.tds del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.tds ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ilc del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ilc ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ild del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ild ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ilf del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ilf ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ils del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.ils ! -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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 *************** *** 647,651 **** !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_lib\lua5.1.lib: $(VERBATIMLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 649,653 ---- !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib: $(VERBATIMLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 655,663 **** !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_dll\lua5.1.dll: $(VERBATIMLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0d32.obj $(VERBATIMLUA_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll\lua5.1 $@ !endif --- 657,665 ---- !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.dll: $(VERBATIMLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0d32.obj $(VERBATIMLUA_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $@ !endif *************** *** 673,677 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 675,679 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ *************** *** 689,693 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ --- 691,695 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ *************** *** 705,709 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 707,711 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 721,725 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ --- 723,727 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ *************** *** 737,741 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 739,743 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ Index: modules_mod_verbatimlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_verbatimlua.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_verbatimlua.dsp 8 Dec 2006 13:19:59 -0000 1.3 --- modules_mod_verbatimlua.dsp 10 Dec 2006 00:47:24 -0000 1.4 *************** *** 56,61 **** # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 56,61 ---- # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.lib" /debug ! # ADD LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" *************** *** 81,86 **** # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 81,86 ---- # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" *************** *** 106,111 **** # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 106,111 ---- # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.lib" ! # ADD LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" *************** *** 131,136 **** # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 131,136 ---- # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" *************** *** 156,161 **** # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 156,161 ---- # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.lib" /debug ! # ADD LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" *************** *** 181,186 **** # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 181,186 ---- # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" *************** *** 206,211 **** # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 206,211 ---- # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_lua.lib" ! # ADD LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" *************** *** 231,236 **** # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 --- 231,236 ---- # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\lua5.1.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_lua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" *************** *** 256,261 **** # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 256,261 ---- # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 264,269 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" --- 264,269 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" *************** *** 279,284 **** # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 279,284 ---- # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 287,292 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua5.1.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Monolithic" --- 287,292 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Release Monolithic" *************** *** 302,307 **** # PROP Intermediate_Dir "msvc6prju_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\.... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:29
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/build/msw Modified Files: wxLua.dsw Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxLua.dsw 9 Dec 2006 21:07:06 -0000 1.13 --- wxLua.dsw 10 Dec 2006 00:47:22 -0000 1.14 *************** *** 4,8 **** ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_lua.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "app_lua"=..\..\apps\build\msw\apps_app_verbatimlua.dsp - Package Owner=<4> Package=<5> *************** *** 13,17 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 13,17 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} *************** *** 28,32 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency --- 28,32 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency *************** *** 58,62 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency --- 58,62 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency *************** *** 85,89 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency --- 85,89 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency *************** *** 115,119 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency --- 115,119 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency *************** *** 157,161 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 157,161 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} *************** *** 175,179 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 175,179 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} *************** *** 193,197 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 193,197 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} *************** *** 211,215 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 211,215 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} *************** *** 232,236 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_lua End Project Dependency }}} --- 232,236 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:26
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/build/bakefiles Modified Files: wxhacks.bkl wxluabase.bkl Log Message: multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxluabase.bkl 8 Dec 2006 13:19:58 -0000 1.23 --- wxluabase.bkl 10 Dec 2006 00:47:22 -0000 1.24 *************** *** 138,149 **** <error>Invalid wxlua-lib value !</error> </if> ! <if cond="value=='lua'"> ! <!-- we build a vanilla lua5.1 library; thus we don't name it with wxLua naming convention --> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua' and TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="value!='lua' and TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> --- 138,145 ---- <error>Invalid wxlua-lib value !</error> </if> ! <if cond="TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxhacks.bkl 8 Dec 2006 13:19:58 -0000 1.16 --- wxhacks.bkl 10 Dec 2006 00:47:22 -0000 1.17 *************** *** 338,340 **** --- 338,360 ---- </if> </define-tag> + + + <!-- A simple tag which helps you to define a library to link to using the same rules used + by wxWidgets. This tag is used in place of <wx-lib>libname</wx-lib> and + will generate an approprately pre and postfixed name as generated by + having used <wxlike-libname>module1</wxlike-libname> in another component. + E.g.: + <wxlike-lib>module1</wxlike-lib> + <wxlike-lib>module2</wxlike-lib> + --> + + <define-tag name="wxlike-lib" rules="exe,lib,dll,module"> + <if cond="TARGETING_WIN32=='1'"> + <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> + </if> + <if cond="TARGETING_WIN32=='0'"> + <sys-lib>wx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> + </if> + </define-tag> + </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:09:11
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1475/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxluasocket.dsp Log Message: removed the unused wxlhandl.[h|cpp] files as requested by John; rebaked Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.vc 8 Dec 2006 13:19:59 -0000 1.51 --- makefile.vc 9 Dec 2006 21:09:06 -0000 1.52 *************** *** 330,334 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj \ - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj \ --- 330,333 ---- *************** *** 347,351 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj \ - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj \ --- 346,349 ---- *************** *** 1152,1158 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** --- 1150,1153 ---- *************** *** 1173,1179 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 1168,1171 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** makefile.bcc 8 Dec 2006 13:19:59 -0000 1.52 --- makefile.bcc 9 Dec 2006 21:09:06 -0000 1.53 *************** *** 337,341 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj \ - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj \ --- 337,340 ---- *************** *** 352,356 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj \ - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj \ borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj \ --- 351,354 ---- *************** *** 1159,1165 **** $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** --- 1157,1160 ---- *************** *** 1180,1186 **** $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 1175,1178 ---- Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** modules_mod_wxluasocket.dsp 8 Dec 2006 13:20:00 -0000 1.27 --- modules_mod_wxluasocket.dsp 9 Dec 2006 21:09:07 -0000 1.28 *************** *** 465,472 **** # Begin Source File - SOURCE=..\..\wxluasocket\src\wxlhandl.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\src\wxlsock.cpp # End Source File --- 465,468 ---- *************** *** 497,504 **** # Begin Source File - SOURCE=..\..\wxluasocket\include\wxlhandl.h - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\include\wxlsock.h # End Source File --- 493,496 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.wat 8 Dec 2006 13:19:59 -0000 1.51 --- makefile.wat 9 Dec 2006 21:09:06 -0000 1.52 *************** *** 740,744 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj & - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj & --- 740,743 ---- *************** *** 755,759 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj & - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj & watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj & --- 754,757 ---- *************** *** 1371,1377 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< --- 1369,1372 ---- *************** *** 1392,1398 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlhandl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< --- 1387,1390 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** makefile.gcc 8 Dec 2006 13:19:59 -0000 1.52 --- makefile.gcc 9 Dec 2006 21:09:06 -0000 1.53 *************** *** 290,294 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlsock.o \ - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldserv.o \ --- 290,293 ---- *************** *** 304,308 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlsock.o \ - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.o \ mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.o \ --- 303,306 ---- *************** *** 1233,1239 **** $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp - $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1231,1234 ---- *************** *** 1254,1260 **** $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.o: ../../wxluasocket/src/wxlhandl.cpp - $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1249,1252 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:09:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1475/modules/wxluasocket/src Removed Files: wxlhandl.cpp Log Message: removed the unused wxlhandl.[h|cpp] files as requested by John; rebaked --- wxlhandl.cpp DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:09:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1475/modules/wxluasocket/include Removed Files: wxlhandl.h Log Message: removed the unused wxlhandl.[h|cpp] files as requested by John; rebaked --- wxlhandl.h DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:09:10
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1475/modules Modified Files: Makefile.in Log Message: removed the unused wxlhandl.[h|cpp] files as requested by John; rebaked Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Makefile.in 8 Dec 2006 13:19:58 -0000 1.47 --- Makefile.in 9 Dec 2006 21:09:06 -0000 1.48 *************** *** 285,289 **** wxluasocket_lib_wxluasocket_bind.o \ wxluasocket_lib_wxlsock.o \ - wxluasocket_lib_wxlhandl.o \ wxluasocket_lib_wxldtarg.o \ wxluasocket_lib_wxldserv.o \ --- 285,288 ---- *************** *** 296,300 **** wxluasocket/include/wxldtarg.h \ wxluasocket/include/dservice.h \ - wxluasocket/include/wxlhandl.h \ wxluasocket/include/wxluasocket_bind.h WXLUASOCKET_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ --- 295,298 ---- *************** *** 304,308 **** wxluasocket_dll_wxluasocket_bind.o \ wxluasocket_dll_wxlsock.o \ - wxluasocket_dll_wxlhandl.o \ wxluasocket_dll_wxldtarg.o \ wxluasocket_dll_wxldserv.o \ --- 302,305 ---- *************** *** 315,319 **** wxluasocket/include/wxldtarg.h \ wxluasocket/include/dservice.h \ - wxluasocket/include/wxlhandl.h \ wxluasocket/include/wxluasocket_bind.h MOD_LUAMODULE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ --- 312,315 ---- *************** *** 1554,1560 **** $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp - wxluasocket_lib_wxlhandl.o: $(srcdir)/wxluasocket/src/wxlhandl.cpp - $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlhandl.cpp - wxluasocket_lib_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp --- 1550,1553 ---- *************** *** 1575,1581 **** $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp - wxluasocket_dll_wxlhandl.o: $(srcdir)/wxluasocket/src/wxlhandl.cpp - $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlhandl.cpp - wxluasocket_dll_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp --- 1568,1571 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:07:10
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv979/build/msw Modified Files: wxLua.dsw Log Message: Removed unused DSP files which I forgot to remove after last bakefile changes Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxLua.dsw 21 May 2006 09:55:24 -0000 1.12 --- wxLua.dsw 9 Dec 2006 21:07:06 -0000 1.13 *************** *** 19,37 **** ############################################################################### - Project: "app_verbatimlua"=..\..\apps\build\msw\apps_app_verbatimlua.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - Begin Project Dependency - Project_Dep_Name mod_verbatimlua - End Project Dependency - }}} - - ############################################################################### - Project: "app_wxlua"=..\..\apps\build\msw\apps_app_wxlua.dsp - Package Owner=<4> --- 19,22 ---- *************** *** 151,166 **** ############################################################################### - Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Project: "mod_verbatimlua"=..\..\modules\build\msw\modules_mod_verbatimlua.dsp - Package Owner=<4> --- 136,139 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:07:09
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv979/modules/build/msw Removed Files: modules_mod_lua.dsp Log Message: Removed unused DSP files which I forgot to remove after last bakefile changes --- modules_mod_lua.dsp DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-09 21:07:09
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv979/apps/build/msw Removed Files: apps_app_verbatimlua.dsp Log Message: Removed unused DSP files which I forgot to remove after last bakefile changes --- apps_app_verbatimlua.dsp DELETED --- |
|
From: John L. <jr...@us...> - 2006-12-08 23:12:18
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16116/wxLua/docs Modified Files: install.html wxlua.html Log Message: update docs for not having to define the WXLUA_LUA_NEWTHREAD HANDLER Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlua.html 7 Dec 2006 22:05:53 -0000 1.9 --- wxlua.html 8 Dec 2006 23:12:15 -0000 1.10 *************** *** 64,69 **** <ul> ! <li>wxLua maintains it's own version of lua 5.1 that is ! slightly modified to track the creation of coroutines.</li> <li>Any program that works using the official --- 64,68 ---- <ul> ! <li>wxLua uses an unmodified copy of lua 5.1.</li> <li>Any program that works using the official *************** *** 1162,1166 **** <li>The editor is run if no parameters are given.</li> ! <li>Note that the switches -c, -q, -e must be specified before -d, -o, -r</li> --- 1161,1167 ---- <li>The editor is run if no parameters are given.</li> ! <li>Note that the switches -c (print console), -q (don't ! quit if no top level window open), -e (execute lua code) must be ! specified before -d, -o, -r</li> *************** *** 1173,1176 **** --- 1174,1187 ---- program name are pushed into the lua as a table named 'arg'.</li> + <ul> + + <li><i>wxLua editor.wx.lua</i> is the same as + just running <i>wxLua</i> itself. You can run the + editor this way to customize it, but please don't forget to + post any enhancements to the wxlua-users mailing list so they can be + incorporated back into wxLua.</li> + + </ul> + <li>If you want to run a program or provide arguments to your lua program that use -X or /X semantics you need to use *************** *** 1332,1348 **** <ul> ! <li>The source code of lua itself. It is basically the original ! source for the version used with as few modifications made as ! possible. </li> ! ! <li>One of the changes made was to add a hook to intercept ! the creation of coroutine lua_States, see lstate.c. In order for the ! wxLuaState to use this hook (internally, you need not worry about it) ! you must define in your compiler <i>WXLUA_LUA_NEWTHREAD</i> ! by typically adding the directive -DWXLUA_LUA_NEWTHREAD. Without this ! define coroutines cannot find the data associated with the lua_State ! and therefore cannot have any wxWidgets classes. You may perhaps be ! able to use pure lua code in coroutines however.</li> </ul> --- 1343,1350 ---- <ul> ! <li>The source code of lua itself. It is the original ! source for the version, with some of the header files copied to the ! include directory for the installation routines. </li> </ul> *************** *** 1449,1453 **** the same way as a wxBitmap, wxPen, or any of the other wxObject derived classes that make ! use of it's ref counting. What this means for wxLua is that instead of keeping pointers to the lua_State you have instances of the wxLuaState, there is a slight overhead for this, but it is minimal. --- 1451,1456 ---- the same way as a wxBitmap, wxPen, or any of the other wxObject derived classes that make ! use of it's ref counting mechanism. What this means for wxLua is that ! instead of keeping pointers to the lua_State you have instances of the wxLuaState, there is a slight overhead for this, but it is minimal. *************** *** 1458,1462 **** things can get out of order. Care must be taken for pushed event handlers from lua because if the lua_State is closed, but the window ! hasn't been deleted just yet... So it's best to have a way to check and the wxLuaState wraps this all up.<br> --- 1461,1465 ---- things can get out of order. Care must be taken for pushed event handlers from lua because if the lua_State is closed, but the window ! hasn't been deleted just yet... It's best to have a way to check and the wxLuaState wraps this all up.<br> Index: install.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/install.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** install.html 10 Mar 2006 07:16:52 -0000 1.10 --- install.html 8 Dec 2006 23:12:15 -0000 1.11 *************** *** 3,48 **** <head> - - - - - - - - [...2515 lines suppressed...] ! <span style="font-family: monospace;">msw</span>, <span style="font-family: monospace;">x11</span>, etc; <span style="font-family: monospace;">WXLIBPOSTFIX </span>can ! be <span style="font-family: monospace;">u</span>, <span style="font-family: monospace;">d</span>, <span style="font-family: monospace;">ud</span>.<br> <br> <span style="font-weight: bold;">NOTE</span>: many ! linkers actually link libraries in the opposite order in which they ! appear on the command line.<br> <br> </div> <br> <hr style="width: 100%; height: 2px;"><br> $Id$ </body> |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:35
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** makefile.vc 20 May 2006 13:12:34 -0000 1.34 --- makefile.vc 8 Dec 2006 13:19:58 -0000 1.35 *************** *** 49,52 **** --- 49,61 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 26 *************** *** 98,120 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" WXLIBPOSTFIX = u !endif !if "$(USE_APPS)" == "1" __apps___depname = sub_apps --- 107,136 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif + !if "$(SHARED)" == "0" + SHARED_SUFFIX = static + !endif + !if "$(SHARED)" == "1" + SHARED_SUFFIX = shared + !endif !if "$(USE_APPS)" == "1" __apps___depname = sub_apps *************** *** 122,128 **** ! all: msvc$(WXLIBPOSTFIX) ! msvc$(WXLIBPOSTFIX): ! -if not exist msvc$(WXLIBPOSTFIX) mkdir msvc$(WXLIBPOSTFIX) ### Targets: ### --- 138,144 ---- ! all: msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### *************** *** 131,137 **** clean: ! -if exist msvc$(WXLIBPOSTFIX)\*.obj del msvc$(WXLIBPOSTFIX)\*.obj ! -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res ! -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean --- 147,153 ---- clean: ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** makefile.bcc 20 May 2006 13:12:34 -0000 1.31 --- makefile.bcc 8 Dec 2006 13:19:58 -0000 1.32 *************** *** 75,78 **** --- 75,88 ---- !endif + # Compile Unicode build of wxWidgets? [0,1] + !ifndef WX_UNICODE + WX_UNICODE = 0 + !endif + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + !ifndef WX_DEBUG + WX_DEBUG = 1 + !endif + # Version of the wx library to build against. !ifndef WX_VERSION *************** *** 147,150 **** --- 157,161 ---- -DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \ -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ + -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ *************** *** 157,169 **** ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" WXLIBPOSTFIX = u !endif !if "$(USE_APPS)" == "1" __apps___depname = apps --- 168,198 ---- ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif + !if "$(BUILD)" == "debug" + WX_DEBUG = 1 + !endif + !if "$(BUILD)" == "release" + WX_DEBUG = 0 + !endif + !if "$(UNICODE)" == "0" + WX_UNICODE = 0 + !endif + !if "$(UNICODE)" == "1" + WX_UNICODE = 1 + !endif + !if "$(SHARED)" == "0" + SHARED_SUFFIX = static + !endif + !if "$(SHARED)" == "1" + SHARED_SUFFIX = shared + !endif !if "$(USE_APPS)" == "1" __apps___depname = apps *************** *** 171,177 **** ! all: borland$(WXLIBPOSTFIX) ! borland$(WXLIBPOSTFIX): ! -if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX) ### Targets: ### --- 200,206 ---- ! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### *************** *** 180,194 **** clean: ! -if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)\apps.bat ..\..\lib\bcc_lib: --- 209,223 ---- clean: ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_lib: *************** *** 202,216 **** modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)\apps.bat !endif --- 231,245 ---- modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.wat 20 May 2006 13:12:34 -0000 1.33 --- makefile.wat 8 Dec 2006 13:19:58 -0000 1.34 *************** *** 49,52 **** --- 49,61 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 26 *************** *** 111,129 **** WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD release ! !ifeq UNICODE 1 WXLIBPOSTFIX = u !endif !endif __apps___depname = !ifeq USE_APPS 1 --- 120,145 ---- WXLIBPOSTFIX = ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = u !endif !endif + SHARED_SUFFIX = + !ifeq SHARED 0 + SHARED_SUFFIX = static + !endif + !ifeq SHARED 1 + SHARED_SUFFIX = shared + !endif __apps___depname = !ifeq USE_APPS 1 *************** *** 136,151 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" & ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ! all : watcom$(WXLIBPOSTFIX) ! watcom$(WXLIBPOSTFIX) : ! -if not exist watcom$(WXLIBPOSTFIX) mkdir watcom$(WXLIBPOSTFIX) ### Targets: ### --- 152,168 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" & UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" & ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ! all : watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) : ! -if not exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### *************** *** 154,162 **** clean : .SYMBOLIC ! -if exist watcom$(WXLIBPOSTFIX)\*.obj del watcom$(WXLIBPOSTFIX)\*.obj ! -if exist watcom$(WXLIBPOSTFIX)\*.res del watcom$(WXLIBPOSTFIX)\*.res ! -if exist watcom$(WXLIBPOSTFIX)\*.lbc del watcom$(WXLIBPOSTFIX)\*.lbc ! -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk ! -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean --- 171,179 ---- clean : .SYMBOLIC ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** makefile.gcc 20 May 2006 13:12:34 -0000 1.32 --- makefile.gcc 8 Dec 2006 13:19:58 -0000 1.33 *************** *** 44,47 **** --- 44,53 ---- WX_SHARED = 0 + # Compile Unicode build of wxWidgets? [0,1] + WX_UNICODE = 0 + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + WX_DEBUG = 1 + # Version of the wx library to build against. WX_VERSION = 26 *************** *** 91,119 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \ ! WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ### Conditionally set variables: ### ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),release) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = u endif endif ifeq ($(USE_APPS),1) __apps___depname = apps --- 97,132 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \ UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \ ! WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = u endif endif + ifeq ($(SHARED),0) + SHARED_SUFFIX = static + endif + ifeq ($(SHARED),1) + SHARED_SUFFIX = shared + endif ifeq ($(USE_APPS),1) __apps___depname = apps *************** *** 121,127 **** ! all: mingw$(WXLIBPOSTFIX) ! mingw$(WXLIBPOSTFIX): ! -if not exist mingw$(WXLIBPOSTFIX) mkdir mingw$(WXLIBPOSTFIX) ### Targets: ### --- 134,140 ---- ! all: mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### *************** *** 130,135 **** clean: ! -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o ! -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean --- 143,148 ---- clean: ! -if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o ! -if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 171,173 **** # Dependencies tracking: ! -include mingw$(WXLIBPOSTFIX)/*.d --- 184,186 ---- # Dependencies tracking: ! -include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:34
|
Update of /cvsroot/wxlua/wxLua/build/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/autopackage Modified Files: default.apspec.in Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: default.apspec.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autopackage/default.apspec.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** default.apspec.in 14 Sep 2006 16:31:17 -0000 1.12 --- default.apspec.in 8 Dec 2006 13:19:58 -0000 1.13 *************** *** 36,41 **** [Prepare] ! # only GTK required: lua, wxWidgets and wxStEdit are statically built in ! ##require @gtk.org/gtk 2.0 # this is checked by GTK require @wxwidgets.org/wxgtk 26.0 --- 36,40 ---- [Prepare] ! # only wxGTK required: lua and wxStEdit are statically built in require @wxwidgets.org/wxgtk 26.0 |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454 Modified Files: Makefile.in configure Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 15 Sep 2006 16:24:35 -0000 1.18 --- Makefile.in 8 Dec 2006 13:19:56 -0000 1.19 *************** *** 31,39 **** ### Targets: ### ! all: $(top_builddir)lib $(top_builddir)bin modules $(__apps___depname) install: all install_modules $(__install_apps___depname) samples desktop mime icon $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! $(INSTALL_DATA) $(top_builddir)build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig uninstall: uninstall_modules $(__uninstall_apps___depname) --- 31,39 ---- ### Targets: ### ! all: $(top_builddir)/lib $(top_builddir)/bin modules $(__apps___depname) install: all install_modules $(__install_apps___depname) samples desktop mime icon $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! $(INSTALL_DATA) $(top_builddir)/build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig uninstall: uninstall_modules $(__uninstall_apps___depname) *************** *** 50,62 **** distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! rm -f ./modules/Makefile ! rm -f ./apps/Makefile ! rm -f $(top_builddir)build/autoconf/wxlua.pc ! $(top_builddir)lib: ! @mkdir -p $(top_builddir)lib ! $(top_builddir)bin: ! @mkdir -p $(top_builddir)bin modules: --- 50,62 ---- distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! (cd ./modules/ && $(MAKE) distclean) ! (cd ./apps/ && $(MAKE) distclean) ! rm -f $(top_builddir)/build/autoconf/wxlua.pc ! $(top_builddir)/lib: ! @mkdir -p $(top_builddir)/lib ! $(top_builddir)/bin: ! @mkdir -p $(top_builddir)/bin modules: *************** *** 86,90 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 86,90 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** configure 9 Aug 2006 03:34:48 -0000 1.39 --- configure 8 Dec 2006 13:19:56 -0000 1.40 *************** *** 1,9 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59 for wxLua 0. # # Report bugs to <fr...@us...>. # ! # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,10 ---- [...12603 lines suppressed...] ! { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ! which seems to be undefined. Please make sure it is defined." >&5 ! echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ! which seems to be undefined. Please make sure it is defined." >&2;} ! ! rm -f "$tmp/stdin" ! case $ac_file in ! -) cat "$tmp/out"; rm -f "$tmp/out";; ! *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ! esac ! ;; ! ! ! ! esac ! ! done # for ac_tag { (exit 0); exit 0; } |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/bakefiles Modified Files: wxhacks.bkl wxlua.bkl wxluabase.bkl Removed Files: utils.bkl Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxluabase.bkl 20 May 2006 13:12:34 -0000 1.22 --- wxluabase.bkl 8 Dec 2006 13:19:58 -0000 1.23 *************** *** 106,112 **** </if> <!-- Put all the objects files generated by --> <!-- the compilation in a subfolder of BUILD --> ! <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> --- 106,122 ---- </if> + <set var="SHARED_SUFFIX"> + <if cond="SHARED=='0'">static</if> + <if cond="SHARED=='1'">shared</if> + </set> + <!-- Put all the objects files generated by --> <!-- the compilation in a subfolder of BUILD --> ! <if cond="FORMAT!='autoconf'"> ! <set var="BUILDDIR"> ! $(FORMAT)$(WXLUA_LIBPOSTFIX)_$(SHARED_SUFFIX) ! </set> ! </if> ! *************** *** 128,135 **** <error>Invalid wxlua-lib value !</error> </if> ! <if cond="TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> --- 138,149 ---- <error>Invalid wxlua-lib value !</error> </if> ! <if cond="value=='lua'"> ! <!-- we build a vanilla lua5.1 library; thus we don't name it with wxLua naming convention --> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua' and TARGETING_WIN32=='1'"> <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> </if> ! <if cond="value!='lua' and TARGETING_WIN32=='0'"> <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib> </if> *************** *** 202,206 **** </if> <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> ! <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> --- 216,220 ---- </if> <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> ! <lib-path>$(top_builddir)/$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxhacks.bkl 23 Feb 2006 13:38:08 -0000 1.15 --- wxhacks.bkl 8 Dec 2006 13:19:58 -0000 1.16 *************** *** 29,38 **** </description> </option> - - <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> - <set var="WX_DEBUG"> - <if cond="BUILD=='debug'">1</if> - <if cond="BUILD=='release'">0</if> - </set> </if> <if cond="not isdefined('UNICODE')"> --- 29,32 ---- *************** *** 46,55 **** </description> </option> - - <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> - <set var="WX_UNICODE"> - <if cond="UNICODE=='1'">1</if> - <if cond="UNICODE=='0'">0</if> - </set> </if> <if cond="not isdefined('SHARED')"> --- 40,43 ---- *************** *** 63,75 **** </description> </option> - - <!-- Unlike DEBUG and UNICODE options, you can build your program as shared --> - <!-- against a static build of wxWidgets. This option allows you to do it. --> - <!-- E.g.: --> - <!-- nmake -fmakefile.vc SHARED=0 WX_SHARED=1 --> - <!-- ./configure - -disable-shared - -with-wxshared --> - <!-- builds in static mode against a shared build of wxWidgets. --> - <!-- Thus we won't define WX_SHARED to a simple redirection to SHARED; we --> - <!-- will allow wxpresets to define it as another, indipendent option. --> </if> </if> --- 51,54 ---- *************** *** 247,250 **** --- 226,259 ---- + + <!-- Rename WX_DEBUG and WX_UNICODE options to BUILD and UNICODE respectively --> + + <if cond="FORMAT!='autoconf' and FORMAT!='msvc6prj'"> + + <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> + <set var="WX_DEBUG"> + <if cond="BUILD=='debug'">1</if> + <if cond="BUILD=='release'">0</if> + </set> + + <!-- Do not use substituteFromDict() function here: it would screw everything up ! --> + <set var="WX_UNICODE"> + <if cond="UNICODE=='1'">1</if> + <if cond="UNICODE=='0'">0</if> + </set> + </if> + + <!-- Unlike DEBUG and UNICODE options, you can build your program as shared --> + <!-- against a static build of wxWidgets. This option allows you to do it. --> + <!-- E.g.: --> + <!-- nmake -fmakefile.vc SHARED=0 WX_SHARED=1 --> + <!-- ./configure - -disable-shared - -with-wxshared --> + <!-- builds in static mode against a shared build of wxWidgets. --> + <!-- Thus we won't define WX_SHARED to a simple redirection to SHARED; we --> + <!-- will allow wxpresets to define it as another, indipendent option. --> + + + + <!-- Combine with 'wx' or 'wx-lib' templates (which are defined in wxpresets) to create a perfectly wx-integrated project. *************** *** 311,318 **** <define-tag name="wxlike-libname" rules="lib,dll,module"> <if cond="TARGETING_WIN32=='1'"> ! <libname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname> </if> <if cond="TARGETING_WIN32=='0'"> ! <libname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname> </if> </define-tag> --- 320,327 ---- <define-tag name="wxlike-libname" rules="lib,dll,module"> <if cond="TARGETING_WIN32=='1'"> ! <libname>wx$(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname> </if> <if cond="TARGETING_WIN32=='0'"> ! <libname>wx$(attributes['prefix'])_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname> </if> </define-tag> *************** *** 323,330 **** <define-tag name="wxlike-dllname" rules="dll"> <if cond="TARGETING_WIN32=='1'"> ! <dllname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</dllname> </if> <if cond="TARGETING_WIN32=='0'"> ! <dllname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</dllname> </if> </define-tag> --- 332,339 ---- <define-tag name="wxlike-dllname" rules="dll"> <if cond="TARGETING_WIN32=='1'"> ! <dllname>wx$(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</dllname> </if> <if cond="TARGETING_WIN32=='0'"> ! <dllname>wx$(attributes['prefix'])_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</dllname> </if> </define-tag> --- utils.bkl DELETED --- Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlua.bkl 15 Sep 2006 16:24:35 -0000 1.26 --- wxlua.bkl 8 Dec 2006 13:19:58 -0000 1.27 *************** *** 66,72 **** <if cond="FORMAT=='autoconf'"> <!-- top_builddir already ends with '/' --> ! <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> --- 66,72 ---- <if cond="FORMAT=='autoconf'"> <!-- top_builddir already ends with '/' --> ! <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set> </if> *************** *** 151,156 **** <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> ! <!-- the DOT is required !! --> ! <src>$(top_builddir)build/autoconf/wxlua.pc</src> </pkgconfig> --- 151,155 ---- <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> ! <src>$(top_builddir)/build/autoconf/wxlua.pc</src> </pkgconfig> |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/apps/build/bakefiles Modified Files: apps.bkl Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** apps.bkl 21 May 2006 09:55:24 -0000 1.41 --- apps.bkl 8 Dec 2006 13:19:57 -0000 1.42 *************** *** 17,31 **** <!-- ================================================================== --> - <set var="FILELISTDIR">../..</set> <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> - <set var="WXLUA_APPSDIR">../..</set> - <set var="SRCDIR">$(WXLUA_APPSDIR)</set> <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="TARGETING_WIN32=='0'"> - <set var="SRCDIR">.</set> - <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: --- 17,28 ---- <!-- ================================================================== --> <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> + + <set-srcdir>../..</set-srcdir> </if> <if cond="TARGETING_WIN32=='0'"> <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: *************** *** 33,38 **** --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <set var="WXLUA_APPSDIR">$(top_srcdir)/apps</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> --- 30,36 ---- --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set> ! ! <!-- leave SRCDIR to its '.' default --> </if> *************** *** 69,86 **** <template id="wxluaapp" template="wxlua"> <app-type>gui</app-type> - <srcdir>$(WXLUA_APPSDIR)</srcdir> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> </template> ! <!-- only used by app_lua and app_verbatimlua --> ! <template id="luainterpreter" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> ! <srcdir>$(WXLUA_APPSDIR)</srcdir> ! ! <include>$(WXLUA_APPSDIR)/../modules/lua/include</include> <sources>$(LUA_SRC)</sources> <headers>$(LUA_HDR)</headers> --- 67,87 ---- <template id="wxluaapp" template="wxlua"> <app-type>gui</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> </template> ! ! ! ! <!-- ================================================================== --> ! <!-- The LUA interpreter target --> ! <!-- ================================================================== --> ! ! <exe id="app_lua" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> ! <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <sources>$(LUA_SRC)</sources> <headers>$(LUA_HDR)</headers> *************** *** 94,118 **** <sys-lib>m</sys-lib> </if> - </template> - - - - - <!-- ================================================================== --> - <!-- The LUA interpreter targets --> - <!-- ================================================================== --> - <exe id="app_lua" template="luainterpreter"> - <!-- avoid clashes with the verbatim lua interpreter and call it 'wxlua-lua' --> <exename>wxlua-lua</exename> <wxlua-lib>lua</wxlua-lib> </exe> - <!-- the verbatim LUA interpreter (compiled without WXLUA_LUA_NEWTHREAD define) --> - <exe id="app_verbatimlua" template="luainterpreter"> - <exename>lua5.1</exename> - <sys-lib>lua5.1</sys-lib> - </exe> - --- 95,103 ---- *************** *** 123,127 **** <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> <sources>$(WXLUAAPP_SRC)</sources> <headers>$(WXLUAAPP_HDR)</headers> --- 108,113 ---- <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxluaapp" ! cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> <sources>$(WXLUAAPP_SRC)</sources> <headers>$(WXLUAAPP_HDR)</headers> |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/apps/build/msw Modified Files: apps.dsw apps_app_lua.dsp apps_app_verbatimlua.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** apps.dsw 21 May 2006 09:55:24 -0000 1.11 --- apps.dsw 8 Dec 2006 13:19:57 -0000 1.12 *************** *** 15,30 **** ############################################################################### - Project: "app_verbatimlua"=apps_app_verbatimlua.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Project: "app_wxlua"=apps_app_wxlua.dsp - Package Owner=<4> --- 15,18 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.bcc 21 May 2006 09:55:24 -0000 1.51 --- makefile.bcc 8 Dec 2006 13:19:57 -0000 1.52 *************** *** 75,78 **** --- 75,88 ---- !endif + # Compile Unicode build of wxWidgets? [0,1] + !ifndef WX_UNICODE + WX_UNICODE = 0 + !endif + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + !ifndef WX_DEBUG + WX_DEBUG = 1 + !endif + # Version of the wx library to build against. !ifndef WX_VERSION *************** *** 131,189 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ $(CFLAGS) APP_LUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_lua_lua.obj ! APP_VERBATIMLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ ! $(CFLAGS) ! APP_VERBATIMLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_verbatimlua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ ! borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj \ ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_bind.obj \ ! borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj \ ! borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\wxlua.exe --- 141,197 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ $(CFLAGS) APP_LUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif + !if "$(SHARED)" == "0" + SHARED_SUFFIX = static + !endif + !if "$(SHARED)" == "1" + SHARED_SUFFIX = shared + !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\wxlua.exe *************** *** 198,212 **** __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" --- 206,220 ---- __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" *************** *** 234,342 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 242,350 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib *************** *** 346,368 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif ! all: borland$(WXLIBPOSTFIX) ! borland$(WXLIBPOSTFIX): ! -if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX) ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: ! -if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe -if exist ..\..\..\bin\wxlua-lua.tds del ..\..\..\bin\wxlua-lua.tds --- 354,376 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_4 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_4 = -v- !endif ! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe -if exist ..\..\..\bin\wxlua-lua.tds del ..\..\..\bin\wxlua-lua.tds *************** *** 371,380 **** -if exist ..\..\..\bin\wxlua-lua.ilf del ..\..\..\bin\wxlua-lua.ilf -if exist ..\..\..\bin\wxlua-lua.ils del ..\..\..\bin\wxlua-lua.ils - -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe - -if exist ..\..\..\bin\lua5.1.tds del ..\..\..\bin\lua5.1.tds - -if exist ..\..\..\bin\lua5.1.ilc del ..\..\..\bin\lua5.1.ilc - -if exist ..\..\..\bin\lua5.1.ild del ..\..\..\bin\lua5.1.ild - -if exist ..\..\..\bin\lua5.1.ilf del ..\..\..\bin\lua5.1.ilf - -if exist ..\..\..\bin\lua5.1.ils del ..\..\..\bin\lua5.1.ils -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxlua.tds del ..\..\..\bin\wxlua.tds --- 379,382 ---- *************** *** 403,489 **** ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, ! | ! ! ..\..\..\bin\lua5.1.exe: $(APP_VERBATIMLUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| ! c0x32.obj $(APP_VERBATIMLUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res | !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! borland$(WXLIBPOSTFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_verbatimlua_lua.obj: ..\..\..\modules\lua\src\lua.c ! $(CC) -q -c -P- -o$@ $(APP_VERBATIMLUA_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAFREEZE_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 405,483 ---- ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAFREEZE_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** apps_app_wxlua.dsp 23 Feb 2006 13:38:07 -0000 1.25 --- apps_app_wxlua.dsp 8 Dec 2006 13:19:57 -0000 1.26 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Application") *************** *** 34,38 **** !MESSAGE "app_wxlua - Win32 Release Monolithic" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release Multilib" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project --- 34,38 ---- !MESSAGE "app_wxlua - Win32 Release Monolithic" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release Multilib" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project *************** *** 49,58 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 49,58 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 74,83 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 74,83 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib lua5.1.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 99,108 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 99,108 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 124,133 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 124,133 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib lua5.1.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" *************** *** 149,158 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 149,158 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib lua5.1.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" *************** *** 174,183 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\m... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/autoconf Modified Files: aclocal.m4 acregen.sh autoconf_inc.m4 configure.ac Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** autoconf_inc.m4 20 May 2006 13:12:34 -0000 1.18 --- autoconf_inc.m4 8 Dec 2006 13:19:57 -0000 1.19 *************** *** 7,11 **** BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then --- 7,11 ---- BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" ! dnl ### begin block 20_COND_BUILD_DEBUG[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 13,17 **** fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then --- 13,17 ---- fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then *************** *** 19,23 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then --- 19,23 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then *************** *** 25,29 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then --- 25,29 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../util/build/bakefiles/util.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then *************** *** 31,35 **** fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then --- 31,35 ---- fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then *************** *** 97,101 **** fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then --- 97,101 ---- fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then *************** *** 121,125 **** fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then --- 121,125 ---- fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then *************** *** 151,155 **** fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then --- 151,155 ---- fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../util/build/bakefiles/util.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then *************** *** 157,161 **** fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then --- 157,161 ---- fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../util/build/bakefiles/util.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then *************** *** 235,238 **** --- 235,262 ---- fi AC_SUBST(COND_WINDOWS_IMPLIB_1) + dnl ### begin block 20_COND_WX_DEBUG_0_WX_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_0_WX_UNICODE_1="#" + if test "x$WX_DEBUG" = "x0" -a "x$WX_UNICODE" = "x1" ; then + COND_WX_DEBUG_0_WX_UNICODE_1="" + fi + AC_SUBST(COND_WX_DEBUG_0_WX_UNICODE_1) + dnl ### begin block 20_COND_WX_DEBUG_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1="#" + if test "x$WX_DEBUG" = "x1" ; then + COND_WX_DEBUG_1="" + fi + AC_SUBST(COND_WX_DEBUG_1) + dnl ### begin block 20_COND_WX_DEBUG_1_WX_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1_WX_UNICODE_0="#" + if test "x$WX_DEBUG" = "x1" -a "x$WX_UNICODE" = "x0" ; then + COND_WX_DEBUG_1_WX_UNICODE_0="" + fi + AC_SUBST(COND_WX_DEBUG_1_WX_UNICODE_0) + dnl ### begin block 20_COND_WX_DEBUG_1_WX_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_WX_DEBUG_1_WX_UNICODE_1="#" + if test "x$WX_DEBUG" = "x1" -a "x$WX_UNICODE" = "x1" ; then + COND_WX_DEBUG_1_WX_UNICODE_1="" + fi + AC_SUBST(COND_WX_DEBUG_1_WX_UNICODE_1) dnl ### begin block 20_COND_WX_PORT_GTK[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_WX_PORT_GTK="#" Index: acregen.sh =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acregen.sh 26 Nov 2005 14:06:05 -0000 1.2 --- acregen.sh 8 Dec 2006 13:19:57 -0000 1.3 *************** *** 1,3 **** ! #!/bin/sh # # Author: Francesco Montorsi --- 1,3 ---- ! #!/bin/bash # # Author: Francesco Montorsi *************** *** 21,24 **** --- 21,33 ---- } + # called when an old version of autoconf is found + function autoconfold() + { + echo "Your autoconf version is $aclocal_maj.$aclocal_min.$aclocal_rel" + echo "Your automake installation is too old; please install automake >= $aclocal_minimal_maj.$aclocal_minimal_min.$aclocal_minimal_rel" + echo "You can download automake from ftp://sources.redhat.com/pub/automake/" + exit 1 + } + # first check if we have an ACLOCAL version recent enough aclocal_verfull=$(aclocal --version) *************** *** 39,42 **** --- 48,70 ---- if [[ "$majok" = "1" && "$minok" = "1" && "$relok" = 0 ]]; then aclocalold; fi + + + + # check if we have an AUTOCONF version recent enough + autoconf_verfull=$(autoconf --version) + autoconf_maj=`echo $autoconf_verfull | sed 's/autoconf (GNU Autoconf) \([0-9]*\).\([0-9]*\).*/\1/'` + autoconf_min=`echo $autoconf_verfull | sed 's/autoconf (GNU Autoconf) \([0-9]*\).\([0-9]*\).*/\2/'` + + autoconf_minimal_maj=2 + autoconf_minimal_min=60 + + majok=$(expr $autoconf_maj \>= $autoconf_minimal_maj) + minok=$(expr $autoconf_min \>= $autoconf_minimal_min) + + if [[ "$majok" = "0" ]]; then autoconfold; fi + if [[ "$majok" = "1" && "$minok" = "0" ]]; then autoconfold; fi + + + # we can safely proceed me=$(basename $0) Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** configure.ac 9 Aug 2006 03:34:48 -0000 1.30 --- configure.ac 8 Dec 2006 13:19:57 -0000 1.31 *************** *** 275,279 **** AC_ADDMODULE([wxbind]) AC_ADDMODULE([wxbindstc]) ! AC_ADDMODULE([lua]) AC_SUBST([WXLUA_MODNAMES]) AC_SUBST([WXLUA_LIBNAMES]) --- 275,282 ---- AC_ADDMODULE([wxbind]) AC_ADDMODULE([wxbindstc]) ! ! WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -llua5.1" ! AC_SUBST([WXLUA_MODNAMES]) AC_SUBST([WXLUA_LIBNAMES]) *************** *** 307,310 **** --- 310,319 ---- fi + # Create the output folders in the current build directory + # (this handles cases like: + # mkdir mybuild && cd mybuild && ../configure && make ) + AS_MKDIR_P(lib) + AS_MKDIR_P(bin) + AC_OUTPUT Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** aclocal.m4 21 May 2006 19:16:59 -0000 1.30 --- aclocal.m4 8 Dec 2006 13:19:57 -0000 1.31 *************** *** 301,305 **** [ #ifndef __INTEL_COMPILER ! #error Not ICC #endif ], --- 301,305 ---- [ #ifndef __INTEL_COMPILER ! This is not ICC #endif ], *************** *** 343,347 **** #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! #error old gcc #endif ], --- 343,347 ---- #if (__GNUC__ < 3) || \ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! This is old gcc #endif ], *************** *** 435,438 **** --- 435,439 ---- powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ *************** *** 528,578 **** AC_DEFUN([AC_BAKEFILE_DEPS], [ AC_MSG_CHECKING([for dependency tracking method]) - DEPS_TRACKING=1 ! if test "x$GCC" = "xyes"; then ! DEPSMODE=gcc ! case "${BAKEFILE_HOST}" in ! *-*-darwin* ) ! dnl -cpp-precomp (the default) conflicts with -MMD option ! dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html) ! DEPSFLAG="-no-cpp-precomp -MMD" ! ;; ! * ) ! DEPSFLAG="-MMD" ! ;; ! esac ! AC_MSG_RESULT([gcc]) ! elif test "x$MWCC" = "xyes"; then ! DEPSMODE=mwcc ! DEPSFLAG="-MM" ! AC_MSG_RESULT([mwcc]) ! elif test "x$SUNCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-xM1" ! AC_MSG_RESULT([Sun cc]) ! elif test "x$SGICC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-M" ! AC_MSG_RESULT([SGI cc]) ! elif test "x$HPCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="+make" ! AC_MSG_RESULT([HP cc]) ! elif test "x$COMPAQCC" = "xyes"; then ! DEPSMODE=gcc ! DEPSFLAG="-MD" ! AC_MSG_RESULT([Compaq cc]) ! else DEPS_TRACKING=0 ! AC_MSG_RESULT([none]) ! fi ! if test $DEPS_TRACKING = 1 ; then ! AC_BAKEFILE_CREATE_FILE_BK_DEPS ! chmod +x bk-deps fi AC_SUBST(DEPS_TRACKING) ]) --- 529,595 ---- AC_DEFUN([AC_BAKEFILE_DEPS], [ + AC_ARG_ENABLE([dependency-tracking], + AS_HELP_STRING([--disable-dependency-tracking], + [don't use dependency tracking even if the compiler can]), + [bk_use_trackdeps="$enableval"]) + AC_MSG_CHECKING([for dependency tracking method]) ! BK_DEPS="" ! if test "x$bk_use_trackdeps" = "xno" ; then DEPS_TRACKING=0 ! AC_MSG_RESULT([disabled]) ! else ! DEPS_TRACKING=1 ! if test "x$GCC" = "xyes"; then ! DEPSMODE=gcc ! case "${BAKEFILE_HOST}" in ! *-*-darwin* ) ! dnl -cpp-precomp (the default) conflicts with -MMD option ! dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html) ! DEPSFLAG="-no-cpp-precomp -MMD" ! ;; ! * ) ! DEPSFLAG="-MMD" ! ;; ! esac ! AC_MSG_RESULT([gcc]) ! elif test "x$MWCC" = "xyes"; then ! DEPSMODE=mwcc ! DEPSFLAG="-MM" ! AC_MSG_RESULT([mwcc]) ! elif test "x$SUNCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-xM1" ! AC_MSG_RESULT([Sun cc]) ! elif test "x$SGICC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="-M" ! AC_MSG_RESULT([SGI cc]) ! elif test "x$HPCC" = "xyes"; then ! DEPSMODE=unixcc ! DEPSFLAG="+make" ! AC_MSG_RESULT([HP cc]) ! elif test "x$COMPAQCC" = "xyes"; then ! DEPSMODE=gcc ! DEPSFLAG="-MD" ! AC_MSG_RESULT([Compaq cc]) ! else ! DEPS_TRACKING=0 ! AC_MSG_RESULT([none]) ! fi ! ! if test $DEPS_TRACKING = 1 ; then ! AC_BAKEFILE_CREATE_FILE_BK_DEPS ! chmod +x bk-deps ! dnl FIXME: make this $(top_builddir)/bk-deps once autoconf-2.60 ! dnl is required (and so top_builddir is never empty): ! BK_DEPS="`pwd`/bk-deps" ! fi fi AC_SUBST(DEPS_TRACKING) + AC_SUBST(BK_DEPS) ]) *************** *** 593,597 **** AC_SUBST(MAKE_SET) ! AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(NM, nm, :) --- 610,626 ---- AC_SUBST(MAKE_SET) ! if test "x$SUNCXX" = "xyes"; then ! dnl Sun C++ compiler requires special way of creating static libs; ! dnl see here for more details: ! dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863 ! AR=$CXX ! AC_SUBST(AR) ! AROPTIONS="-xar -o" ! else ! AC_CHECK_TOOL(AR, ar, ar) ! AROPTIONS=rcu ! fi ! AC_SUBST(AROPTIONS) ! AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(NM, nm, :) *************** *** 603,607 **** INSTALL_DIR="mkdir -p" ;; ! *) INSTALL_DIR="$INSTALL -d" ;; esac --- 632,639 ---- INSTALL_DIR="mkdir -p" ;; ! * ) ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ;; esac *************** *** 659,662 **** --- 691,695 ---- ICC_PCH=0 USE_PCH=0 + BK_MAKE_PCH="" case ${BAKEFILE_HOST} in *************** *** 676,683 **** [ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! #error "no pch support" #endif #if (__GNUC__ < 3) ! #error "no pch support" #endif #if (__GNUC__ == 3) && \ --- 709,716 ---- [ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) ! There is no PCH support #endif #if (__GNUC__ < 3) ! There is no PCH support #endif #if (__GNUC__ == 3) && \ *************** *** 685,689 **** ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! #error "no pch support" #endif ], --- 718,722 ---- ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ( defined(__INTEL_COMPILER) ) ! There is no PCH support #endif ], *************** *** 696,701 **** [ #if !defined(__INTEL_COMPILER) || \ ! (__INTEL_COMPILER < 900) ! #error "no pch support" #endif ], --- 729,734 ---- [ #if !defined(__INTEL_COMPILER) || \ ! (__INTEL_COMPILER < 800) ! There is no PCH support #endif ], *************** *** 712,715 **** --- 745,752 ---- AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH chmod +x bk-make-pch + dnl FIXME: make this $(top_builddir)/bk-make-pch once + dnl autoconf-2.60 is required (and so top_builddir is + dnl never empty): + BK_MAKE_PCH="`pwd`/bk-make-pch" fi fi *************** *** 718,721 **** --- 755,759 ---- AC_SUBST(GCC_PCH) AC_SUBST(ICC_PCH) + AC_SUBST(BK_MAKE_PCH) ]) *************** *** 745,749 **** AC_DEFUN([AC_BAKEFILE], [ ! AC_PREREQ(2.58) if test "x$BAKEFILE_HOST" = "x"; then --- 783,787 ---- AC_DEFUN([AC_BAKEFILE], [ ! AC_PREREQ([2.58]) if test "x$BAKEFILE_HOST" = "x"; then *************** *** 1512,1516 **** fi ;; ! -use-pch ) shift add_to_cmdline=0 --- 1550,1554 ---- fi ;; ! -use-pch|-use_pch ) shift add_to_cmdline=0 *************** *** 1544,1548 **** EOT # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create-pch ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o --- 1582,1586 ---- EOT # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/apps Modified Files: Makefile.in Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Makefile.in 15 Sep 2006 16:24:35 -0000 1.43 --- Makefile.in 8 Dec 2006 13:19:57 -0000 1.44 *************** *** 17,23 **** --- 17,26 ---- INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DIR = @INSTALL_DIR@ + BK_DEPS = @BK_DEPS@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ bindir = @bindir@ + LIBS = @LIBS@ LDFLAGS_GUI = @LDFLAGS_GUI@ CC = @CC@ *************** *** 42,54 **** DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o - APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ - -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ - $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) - APP_VERBATIMLUA_OBJECTS = \ - app_verbatimlua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) --- 45,52 ---- DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 81,87 **** @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) ! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) --- 79,85 ---- @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) ! @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) *************** *** 90,106 **** @COND_WX_PORT_MAC@WX_PORT_WITHVERSION = $(WX_PORT) @COND_WX_PORT_MGL@WX_PORT_WITHVERSION = $(WX_PORT) ! @COND_BUILD_DEBUG_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d ! @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxlua-lua$(EXEEXT) ! @COND_PLATFORM_MAC_1@__app_verbatimlua___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL $(top_builddir)bin/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi --- 88,102 ---- @COND_WX_PORT_MAC@WX_PORT_WITHVERSION = $(WX_PORT) @COND_WX_PORT_MGL@WX_PORT_WITHVERSION = $(WX_PORT) ! @COND_WX_DEBUG_1_WX_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d ! @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)/bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi *************** *** 114,121 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi --- 110,117 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi *************** *** 128,135 **** @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ ! @COND_USE_WXLUACANAPP_1@ $(top_builddir)bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluacan$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxluacan$(EXEEXT) ; fi --- 124,131 ---- @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ ! @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxluacan$(EXEEXT) ; fi *************** *** 141,148 **** @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ ! @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluafreeze$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ wxluafreeze$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ --- 137,144 ---- @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ ! @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)/bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluafreeze$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ wxluafreeze$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ *************** *** 158,170 **** ### Targets: ### ! all: $(top_builddir)bin/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua install_app_verbatimlua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_verbatimlua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) - $(STRIP) $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 154,165 ---- ### Targets: ### ! all: $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 175,190 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)bin/wxlua-lua$(EXEEXT) ! rm -f $(top_builddir)bin/lua5.1$(EXEEXT) ! rm -f $(top_builddir)bin/wxlua$(EXEEXT) ! rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) ! rm -f $(top_builddir)bin/wxluacan$(EXEEXT) ! rm -f $(top_builddir)bin/wxluafreeze$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(__app_lua___mac_setfilecmd) --- 170,184 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/bin/wxlua-lua$(EXEEXT) ! rm -f $(top_builddir)/bin/wxlua$(EXEEXT) ! rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) ! rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 $(__app_lua___mac_setfilecmd) *************** *** 192,214 **** install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) ! $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! ! $(__app_verbatimlua___mac_setfilecmd) ! ! install_app_verbatimlua: ! $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! ! uninstall_app_verbatimlua: ! rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) ! ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 186,196 ---- install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 217,227 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lstedit $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 199,209 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lstedit $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 230,240 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 212,222 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 243,253 **** @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 225,235 ---- @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 256,310 **** @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c ! ! app_verbatimlua_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_VERBATIMLUA_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c ! app_wxlua_wxlua.o: $(top_srcdir)/apps/wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/wxlua.cpp ! app_wxlua_lconsole.o: $(top_srcdir)/apps/wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/lconsole.cpp ! app_wxlua_wxlua_rc.o: $(top_srcdir)/apps/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluaedit_wxledit.o: $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp ! app_wxluaedit_wxluaedit.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp ! app_wxluaedit_wxluaedit_rc.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluacan_wxluacan.o: $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp ! app_wxluacan_cancom.o: $(top_srcdir)/apps/wxluacan/src/cancom.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cancom.cpp ! app_wxluacan_wxluacan_bind.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_bind.cpp ! app_wxluacan_cansim.o: $(top_srcdir)/apps/wxluacan/src/cansim.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cansim.cpp ! app_wxluacan_canlua.o: $(top_srcdir)/apps/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/canlua.cpp ! app_wxluacan_cansim_rc.o: $(top_srcdir)/apps/wxluacan/src/cansim.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluafreeze_wxluafreeze.o: $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAFREEZE_CXXFLAGS) $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.cpp ! app_wxluafreeze_wxluafreeze_rc.o: $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --- 238,289 ---- @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c ! app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp ! app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp ! app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(srcdir)/wxluaedit/src/wxledit.cpp ! app_wxluaedit_wxluaedit.o: $(srcdir)/wxluaedit/src/wxluaedit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(srcdir)/wxluaedit/src/wxluaedit.cpp ! app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp ! app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp ! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp ! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp ! app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAFREEZE_CXXFLAGS) $(srcdir)/wxluafreeze/src/wxluafreeze.cpp ! app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) *************** *** 313,315 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_verbatimlua uninstall_app_verbatimlua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 292,294 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:14
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw modules_mod_luamodule.dsp modules_mod_verbatimlua.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.bcc 15 Sep 2006 16:24:35 -0000 1.51 --- makefile.bcc 8 Dec 2006 13:19:59 -0000 1.52 *************** *** 75,78 **** --- 75,88 ---- !endif + # Compile Unicode build of wxWidgets? [0,1] + !ifndef WX_UNICODE + WX_UNICODE = 0 + !endif + + # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + !ifndef WX_DEBUG [...2109 lines suppressed...] $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) $** Index: modules_mod_verbatimlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_verbatimlua.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modules_mod_verbatimlua.dsp 6 Dec 2006 06:58:23 -0000 1.2 --- modules_mod_verbatimlua.dsp 8 Dec 2006 13:19:59 -0000 1.3 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_verbatimlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_verbatimlua.mak" CFG="mod_verbatimlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_verbatimlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_verbatimlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_verbatimlua.mak" CFG="mod_verbatimlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_verbatimlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 35,39 **** !MESSAGE "mod_verbatimlua - Win32 Release Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_verbatimlua - Win32 Release Multilib" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 35,39 ---- !MESSAGE "mod_verbatimlua - Win32 Release Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_verbatimlua - Win32 Release Multilib" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 49,58 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c --- 49,58 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c *************** *** 74,83 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c --- 74,83 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c *************** *** 99,108 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c --- 99,108 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c *************** *** 124,133 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c --- 124,133 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c *************** *** 149,158 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c --- 149,158 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c *************** *** 174,183 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c --- 174,183 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c *************** *** 199,208 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c --- 199,208 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c *************** *** 224,233 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c --- 224,233 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\lua5.1.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c *************** *** 249,258 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 249,258 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 272,281 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 272,281 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 295,304 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c --- 295,304 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c *************** *** 318,327 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c --- 318,327 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c *************** *** 341,350 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 341,350 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 364,373 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 364,373 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 387,396 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c --- 387,396 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c *************** *** 410,419 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c --- 410,419 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj_static\mod_verbatimlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\lua5.1.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** modules_mod_wxlua.dsp 15 Sep 2006 16:24:36 -0000 1.24 --- modules_mod_wxlua.dsp 8 Dec 2006 13:20:00 -0000 1.25 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release Multilib" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 35,39 **** !MESSAGE "mod_wxlua - Win32 Release Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release Multilib" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 35,39 ---- !MESSAGE "mod_wxlua - Win32 Release Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release Multilib" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 49,71 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" --- 49,71 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 74,96 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" --- 74,96 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 99,121 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" --- 99,121 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 124,146 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" --- 124,146 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" *************** *** 149,171 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Multilib" --- 149,171 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "msvc6prjd_shared\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /E... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:05
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/modules Modified Files: Makefile.in Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Makefile.in 6 Dec 2006 06:58:22 -0000 1.46 --- Makefile.in 8 Dec 2006 13:19:58 -0000 1.47 *************** *** 26,29 **** --- 26,31 ---- INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ + BK_DEPS = @BK_DEPS@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ *************** *** 32,36 **** --- 34,40 ---- [...2712 lines suppressed...] ! wxluasocket_dll_dservice.o: $(srcdir)/wxluasocket/src/dservice.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/dservice.cpp ! wxluasocket_dll_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp ! mod_luamodule_luamodule.o: $(srcdir)/luamodule/src/luamodule.cpp ! $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp *************** *** 1854,1856 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_verbatimlua_lib uninstall_verbatimlua_lib install_verbatimlua_lib_headers uninstall_verbatimlua_lib_headers install_verbatimlua_dll uninstall_verbatimlua_dll install_verbatimlua_dll_headers uninstall_verbatimlua_dll_headers install_lua_lib uninstall_lua_lib install_lua_lib_headers uninstall_lua_lib_headers install_lua_dll uninstall_lua_dll install_lua_dll_headers uninstall_lua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup --- 1597,1599 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_verbatimlua_lib uninstall_verbatimlua_lib install_verbatimlua_lib_headers uninstall_verbatimlua_lib_headers install_verbatimlua_dll uninstall_verbatimlua_dll install_verbatimlua_dll_headers uninstall_verbatimlua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup |
