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...> - 2007-08-01 10:08:56
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** configure.ac 27 Jul 2007 01:11:10 -0000 1.45 --- configure.ac 1 Aug 2007 10:08:22 -0000 1.46 *************** *** 55,61 **** # Options for the MODULES section ! AC_ARG_ENABLE([wxbindstc], ! [AC_HELP_STRING([--enable-wxbindstc], [Compiles the wxLua bindings for STC (default is yes)])], ! [], [enable_wxbindstc=yes]) AC_ARG_ENABLE([wxluadebug], [AC_HELP_STRING([--enable-wxluadebug], [Compiles the wxLua debug support (default is yes)])], --- 55,82 ---- # Options for the MODULES section ! # NOTE: AC_BINDLIB_ENABLE saves us from some copy&paste ! AC_DEFUN([AC_BINDLIB_ENABLE], ! [ ! AC_ARG_ENABLE([$1], ! [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list="$wxbind_list,$1"]) ! ]) ! ! AC_BINDLIB_ENABLE([adv], [wxAdvanced]) ! AC_BINDLIB_ENABLE([aui], [wxAUI]) ! AC_BINDLIB_ENABLE([base], [wxBase]) ! AC_BINDLIB_ENABLE([core], [wxCore]) ! AC_BINDLIB_ENABLE([gl], [wxGl]) ! AC_BINDLIB_ENABLE([html], [wxHTML]) ! AC_BINDLIB_ENABLE([media], [wxMedia]) ! AC_BINDLIB_ENABLE([net], [wxNet]) ! AC_BINDLIB_ENABLE([richtext], [wxRichText]) ! AC_BINDLIB_ENABLE([stc], [wxSTC]) ! AC_BINDLIB_ENABLE([xml], [wxXml]) ! AC_BINDLIB_ENABLE([xrc], [wxXRC]) ! ! # remove initial comma: ! wxbind_list=${wxbind_list:1} ! AC_ARG_ENABLE([wxluadebug], [AC_HELP_STRING([--enable-wxluadebug], [Compiles the wxLua debug support (default is yes)])], *************** *** 80,84 **** --- 101,117 ---- UTILS_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) + UTILS_YESNO_OPTCHECK([USE_WXBINDADV], [enable_wxbindadv], [--enable-wxbindadv]) + UTILS_YESNO_OPTCHECK([USE_WXBINDAUI], [enable_wxbindaui], [--enable-wxbindaui]) + UTILS_YESNO_OPTCHECK([USE_WXBINDBASE], [enable_wxbindbase], [--enable-wxbindbase]) + UTILS_YESNO_OPTCHECK([USE_WXBINDCORE], [enable_wxbindcore], [--enable-wxbindcore]) + UTILS_YESNO_OPTCHECK([USE_WXBINDGL], [enable_wxbindgl], [--enable-wxbindgl]) + UTILS_YESNO_OPTCHECK([USE_WXBINDHTML], [enable_wxbindhtml], [--enable-wxbindhtml]) + UTILS_YESNO_OPTCHECK([USE_WXBINDMEDIA], [enable_wxbindmedia], [--enable-wxbindmedia]) + UTILS_YESNO_OPTCHECK([USE_WXBINDNET], [enable_wxbindnet], [--enable-wxbindnet]) + UTILS_YESNO_OPTCHECK([USE_WXBINDRICHTEXT], [enable_wxbindrichtext], [--enable-wxbindrichtext]) UTILS_YESNO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) + UTILS_YESNO_OPTCHECK([USE_WXBINDXML], [enable_wxbindxml], [--enable-wxbindxml]) + UTILS_YESNO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) + UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) UTILS_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket]) *************** *** 126,130 **** AC_PROG_CXX ! WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) --- 159,163 ---- AC_PROG_CXX ! WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) *************** *** 407,415 **** ]) AC_ADDMODULE([wxluasocket]) AC_ADDMODULE([wxluadebug]) AC_ADDMODULE([wxlua]) - AC_ADDMODULE([wxbind]) - AC_ADDMODULE([wxbindstc]) WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" --- 440,459 ---- ]) + AC_ADDMODULE([wxbindadv]) + AC_ADDMODULE([wxbindaui]) + AC_ADDMODULE([wxbindbase]) + AC_ADDMODULE([wxbindcore]) + AC_ADDMODULE([wxbindgl]) + AC_ADDMODULE([wxbindhtml]) + AC_ADDMODULE([wxbindmedia]) + AC_ADDMODULE([wxbindnet]) + AC_ADDMODULE([wxbindrichtext]) + AC_ADDMODULE([wxbindstc]) + AC_ADDMODULE([wxbindxml]) + AC_ADDMODULE([wxbindxrc]) + AC_ADDMODULE([wxluasocket]) AC_ADDMODULE([wxluadebug]) AC_ADDMODULE([wxlua]) WXLUA_LIBNAMES="$WXLUA_LIBNAMES lua5.1" *************** *** 468,472 **** # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) macro must be used ! WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN --- 512,517 ---- # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) ! # macro must be used ! WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN *************** *** 500,503 **** --- 545,561 ---- [" - wxBindSTC module: yes"], [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], + [" - wxBindSTC module: yes"], + [" - wxBindSTC module: no"]) + UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], [" - wxLuaDebug module: yes"], *************** *** 516,519 **** --- 574,580 ---- [" - install custom wxBind stuff: no"]) + echo " - wxBind modules activated: " + echo " $wxbind_list" + WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:56
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/apps Modified Files: Makefile.in Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Makefile.in 16 Jul 2007 19:34:00 -0000 1.63 --- Makefile.in 1 Aug 2007 10:08:22 -0000 1.64 *************** *** 59,64 **** -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - app_wxlua_lconsole.o \ app_wxlua_wxlua.o \ $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ --- 59,64 ---- -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ + app_wxlua_lconsole.o \ $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ *************** *** 72,80 **** $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - app_wxluacan_cancom.o \ - app_wxluacan_canlua.o \ - app_wxluacan_cansim.o \ app_wxluacan_wxluacan.o \ app_wxluacan_wxluacan_bind.o \ $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ --- 72,80 ---- $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_wxluacan.o \ + app_wxluacan_cancom.o \ app_wxluacan_wxluacan_bind.o \ + app_wxluacan_cansim.o \ + app_wxluacan_canlua.o \ $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ *************** *** 393,402 **** $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c - app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp - $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp - app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --- 393,402 ---- $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.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) --include-dir $(LUA_DIR)/include *************** *** 411,428 **** $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp ! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp ! app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.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_rc.o: $(srcdir)/wxluacan/src/cansim.rc --- 411,428 ---- $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include + 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 |
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.vc 1 Aug 2007 03:21:24 -0000 1.72 --- makefile.vc 1 Aug 2007 10:08:23 -0000 1.73 *************** *** 196,205 **** $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_43)$(VAR_199) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ [...1424 lines suppressed...] ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) /Ycwx/wxprec.h $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.bcc 1 Aug 2007 03:21:23 -0000 1.73 --- makefile.bcc 1 Aug 2007 10:08:23 -0000 1.74 *************** *** 255,264 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ [...1424 lines suppressed...] ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.wat 1 Aug 2007 03:21:24 -0000 1.72 --- makefile.wat 1 Aug 2007 10:08:24 -0000 1.73 *************** *** 874,883 **** $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & [...1420 lines suppressed...] $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj : .AUTODEPEND ..\..\wxluasocket\src\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.gcc 1 Aug 2007 03:21:23 -0000 1.72 --- makefile.gcc 1 Aug 2007 10:08:23 -0000 1.73 *************** *** 177,186 **** -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.o WXLUA_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ [...1420 lines suppressed...] $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.o: ../../wxluasocket/src/wxluasocket_bind.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.o: ../../wxluasocket/src/dummy.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.o: ../../wxluasocket/src/wxldserv.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< |
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:28
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/modules Modified Files: Makefile.in Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Makefile.in 16 Jul 2007 20:29:51 -0000 1.61 --- Makefile.in 1 Aug 2007 10:08:23 -0000 1.62 *************** *** 125,134 **** $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! wxlua_lib_dummy.o \ ! wxlua_lib_wxlbind.o \ wxlua_lib_wxlcallb.o \ wxlua_lib_wxlstate.o \ ! wxlua_lib_wxlua.o \ ! wxlua_lib_wxlua_bind.o WXLUA_LIB_ODEP = $(___pch_wxprec_wxlua_lib_wx_wxprec_h_gch___depname) WXLUA_DLL_CXXFLAGS = $(__wxlua_dll_PCH_INC) \ [...1693 lines suppressed...] + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp + wxluasocket_dll_wxldserv.o: $(srcdir)/wxluasocket/src/wxldserv.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldserv.cpp *************** *** 3374,3386 **** $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp - wxluasocket_dll_wxluasocket_bind.o: $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp $(WXLUASOCKET_DLL_ODEP) - $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp - - wxluasocket_dll_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(WXLUASOCKET_DLL_ODEP) - $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp - - wxluasocket_dll_wxlsock.o: $(srcdir)/wxluasocket/src/wxlsock.cpp $(WXLUASOCKET_DLL_ODEP) - $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp - mod_luamodule_luamodule.o: $(srcdir)/luamodule/src/luamodule.cpp $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp --- 3383,3386 ---- |
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** common.bkl 16 Jul 2007 22:53:31 -0000 1.14 --- common.bkl 1 Aug 2007 10:08:23 -0000 1.15 *************** *** 152,155 **** --- 152,159 ---- <install-headers-to>$(INCLUDEDIR)</install-headers-to> </define-tag> + <define-tag name="module-dep"> + <wxlua-lib>$(value)</wxlua-lib> + <depends>$(value)_lib</depends> + </define-tag> </define-rule> *************** *** 211,214 **** --- 215,222 ---- <define>WXMAKINGDLL_$(value)</define> </define-tag> + <define-tag name="module-dep"> + <wxlua-lib>$(value)</wxlua-lib> + <depends>$(value)_dll</depends> + </define-tag> </define-rule> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** modules.bkl 16 Jul 2007 19:34:32 -0000 1.47 --- modules.bkl 1 Aug 2007 10:08:23 -0000 1.48 *************** *** 115,119 **** <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 115,119 ---- <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 124,131 **** <wxlua_stddll id="wxbindadv_dll" cond="SHARED=='1' and USE_WXBINDADV=='1'"> <module-name>WXBINDADV</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 124,131 ---- <wxlua_stddll id="wxbindadv_dll" cond="SHARED=='1' and USE_WXBINDADV=='1'"> <module-name>WXBINDADV</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 136,143 **** <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> <module-name>WXBINDAUI</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>aui</wx-lib> </wxlua_stddll> --- 136,143 ---- <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> <module-name>WXBINDAUI</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>aui</wx-lib> </wxlua_stddll> *************** *** 149,154 **** <wxlua_stddll id="wxbindbase_dll" cond="SHARED=='1'"> <module-name>WXBINDBASE</module-name> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 149,154 ---- <wxlua_stddll id="wxbindbase_dll" cond="SHARED=='1'"> <module-name>WXBINDBASE</module-name> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 159,165 **** <wxlua_stddll id="wxbindcore_dll" cond="SHARED=='1'"> <module-name>WXBINDCORE</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 159,165 ---- <wxlua_stddll id="wxbindcore_dll" cond="SHARED=='1'"> <module-name>WXBINDCORE</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 170,177 **** <wxlua_stddll id="wxbindgl_dll" cond="SHARED=='1' and USE_WXBINDGL=='1'"> <module-name>WXBINDGL</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 170,177 ---- <wxlua_stddll id="wxbindgl_dll" cond="SHARED=='1' and USE_WXBINDGL=='1'"> <module-name>WXBINDGL</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 182,189 **** <wxlua_stddll id="wxbindhtml_dll" cond="SHARED=='1' and USE_WXBINDHTML=='1'"> <module-name>WXBINDHTML</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 182,189 ---- <wxlua_stddll id="wxbindhtml_dll" cond="SHARED=='1' and USE_WXBINDHTML=='1'"> <module-name>WXBINDHTML</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 194,202 **** <wxlua_stddll id="wxbindmedia_dll" cond="SHARED=='1' and USE_WXBINDMEDIA=='1'"> <module-name>WXBINDMEDIA</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxbindnet</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 194,202 ---- <wxlua_stddll id="wxbindmedia_dll" cond="SHARED=='1' and USE_WXBINDMEDIA=='1'"> <module-name>WXBINDMEDIA</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxbindnet</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 207,214 **** <wxlua_stddll id="wxbindnet_dll" cond="SHARED=='1' and USE_WXBINDNET=='1'"> <module-name>WXBINDNET</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 207,214 ---- <wxlua_stddll id="wxbindnet_dll" cond="SHARED=='1' and USE_WXBINDNET=='1'"> <module-name>WXBINDNET</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 219,226 **** <wxlua_stddll id="wxbindrichtext_dll" cond="SHARED=='1' and USE_WXBINDRICHTEXT=='1'"> <module-name>WXBINDRICHTEXT</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>richtext</wx-lib> </wxlua_stddll> --- 219,226 ---- <wxlua_stddll id="wxbindrichtext_dll" cond="SHARED=='1' and USE_WXBINDRICHTEXT=='1'"> <module-name>WXBINDRICHTEXT</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>richtext</wx-lib> </wxlua_stddll> *************** *** 232,239 **** <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>stc</wx-lib> </wxlua_stddll> --- 232,239 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>stc</wx-lib> </wxlua_stddll> *************** *** 245,251 **** <wxlua_stddll id="wxbindxml_dll" cond="SHARED=='1' and USE_WXBINDXML=='1'"> <module-name>WXBINDXML</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 245,251 ---- <wxlua_stddll id="wxbindxml_dll" cond="SHARED=='1' and USE_WXBINDXML=='1'"> <module-name>WXBINDXML</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 256,263 **** <wxlua_stddll id="wxbindxrc_dll" cond="SHARED=='1' and USE_WXBINDXRC=='1'"> <module-name>WXBINDXRC</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 256,263 ---- <wxlua_stddll id="wxbindxrc_dll" cond="SHARED=='1' and USE_WXBINDXRC=='1'"> <module-name>WXBINDXRC</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 269,274 **** <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 269,274 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 279,287 **** <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> ! <wxlua-lib>wxluadebug</wxlua-lib> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 279,287 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> ! <module-dep>wxluadebug</module-dep> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:57
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** makefile.vc 16 Jul 2007 19:34:07 -0000 1.70 --- makefile.vc 1 Aug 2007 03:21:22 -0000 1.71 *************** *** 319,322 **** --- 319,334 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib !endif *************** *** 507,511 **** ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif --- 519,523 ---- ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif *************** *** 517,521 **** ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif --- 529,533 ---- ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif *************** *** 527,531 **** ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif --- 539,543 ---- ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif *************** *** 537,541 **** ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif --- 549,553 ---- ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** makefile.bcc 16 Jul 2007 19:34:07 -0000 1.70 --- makefile.bcc 1 Aug 2007 03:21:22 -0000 1.71 *************** *** 311,314 **** --- 311,326 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib !endif *************** *** 523,527 **** ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 535,539 ---- ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 533,537 **** ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 545,549 ---- ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 543,547 **** ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 555,559 ---- ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 553,557 **** ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 565,569 ---- ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.wat 16 Jul 2007 19:34:07 -0000 1.71 --- makefile.wat 1 Aug 2007 03:21:22 -0000 1.72 *************** *** 251,254 **** --- 251,283 ---- !endif !endif + __WXLIB_GL_NAME_p = + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !endif + !endif + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !endif + !endif __WXLIB_AUI_NAME_p = !ifeq BUILD debug *************** *** 669,673 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 698,702 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 689,693 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 718,722 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i *************** *** 707,711 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i --- 736,740 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i *************** *** 724,728 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i --- 753,757 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** makefile.gcc 16 Jul 2007 19:34:07 -0000 1.70 --- makefile.gcc 1 Aug 2007 03:21:22 -0000 1.71 *************** *** 286,289 **** --- 286,317 ---- ifeq ($(WX_MONOLITHIC),0) ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)d_aui endif *************** *** 587,591 **** ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 615,619 ---- ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 598,602 **** ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 626,630 ---- ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 607,611 **** ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 635,639 ---- ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 615,619 **** ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o ! $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 643,647 ---- ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:57
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/apps/build/msvc8 Modified Files: apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** apps_app_wxluafreeze.vcproj 16 Jul 2007 19:34:07 -0000 1.7 --- apps_app_wxluafreeze.vcproj 1 Aug 2007 03:21:22 -0000 1.8 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 101,105 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 120,124 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 120,124 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 139,143 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 139,143 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 158,162 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 158,162 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 177,181 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 177,181 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 196,200 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 196,200 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 215,219 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 215,219 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 234,238 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 234,238 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 253,257 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 253,257 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 272,276 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 272,276 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 291,295 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 291,295 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 310,314 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 310,314 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** apps_app_wxlua.vcproj 16 Jul 2007 19:34:04 -0000 1.7 --- apps_app_wxlua.vcproj 1 Aug 2007 03:21:22 -0000 1.8 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.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 comctl... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:57
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/bindings/wxwidgets Modified Files: wxcore_defsutils.i wxcore_override.hpp wxcore_sizer.i Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: wxcore_defsutils.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_defsutils.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_defsutils.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_defsutils.i 1 Aug 2007 03:21:23 -0000 1.2 *************** *** 108,112 **** %function %rename wxExecuteStdoutStderr long wxExecute(const wxString& command, wxArrayString& output, wxArrayString& errors, int flags = 0) %function void wxExit() ! %function int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError *rc = NULL, int flags = 0) %function unsigned long wxGetProcessId() %function bool wxShell(const wxString& command = "") --- 108,115 ---- %function %rename wxExecuteStdoutStderr long wxExecute(const wxString& command, wxArrayString& output, wxArrayString& errors, int flags = 0) %function void wxExit() ! ! // %override [int, wxKillError rc] wxKill(long pid, wxSignal sig = wxSIGTERM, int flags = 0) ! // C++ Func: int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError *rc = NULL, int flags = 0) ! %function int wxKill(long pid, wxSignal sig = wxSIGTERM, int flags = 0) %function unsigned long wxGetProcessId() %function bool wxShell(const wxString& command = "") Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_override.hpp 22 Jul 2007 04:38:28 -0000 1.2 --- wxcore_override.hpp 1 Aug 2007 03:21:23 -0000 1.3 *************** *** 792,798 **** // ---------------------------------------------------------------------------- ! // Overrides for defsutil.i // ---------------------------------------------------------------------------- %override wxLua_function_wxExecuteStdout // %function %rename wxExecuteStdout long wxExecute(const wxString& command, wxArrayString& output, int flags = 0) --- 792,825 ---- // ---------------------------------------------------------------------------- ! // Overrides for defsutils.i // ---------------------------------------------------------------------------- + %override wxLua_function_wxKill + // %function int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError *rc = NULL, int flags = 0) + static int LUACALL wxLua_function_wxKill(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get number of arguments + int argCount = lua_gettop(L); + // int flags = 0 + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : 0); + // wxKillError rc = NULL + wxKillError rc = wxKILL_OK; + //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlState.ttouserdata(3) : NULL); + // wxSignal sig = wxSIGTERM + wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getintegertype(L, 2) : wxSIGTERM); + // long pid + long pid = (long)wxlua_getnumbertype(L, 1); + // call wxKill + returns = (wxKill(pid, sig, &rc, flags)); + // push the result number + lua_pushnumber(L, returns); + lua_pushnumber(L, rc); + + return 2; + } + %end + %override wxLua_function_wxExecuteStdout // %function %rename wxExecuteStdout long wxExecute(const wxString& command, wxArrayString& output, int flags = 0) *************** *** 2453,2456 **** --- 2480,2501 ---- // Overrides for sizer.i // ---------------------------------------------------------------------------- + + %override wxLua_wxGBSizerItem_GetEndPos + // void GetEndPos(int& row, int& col) + static int LUACALL wxLua_wxGBSizerItem_GetEndPos(lua_State *L) + { + wxLuaState wxlState(L); + int col = 0; + int row = 0; + // get this + wxGBSizerItem * self = (wxGBSizerItem *)wxlState.GetUserDataType(1, s_wxluatag_wxGBSizerItem); + // call GetEndPos + self->GetEndPos(row, col); + lua_pushnumber(L, row); + lua_pushnumber(L, col); + return 2; + } + %end + // ---------------------------------------------------------------------------- // Overrides for thread.i Index: wxcore_sizer.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_sizer.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_sizer.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_sizer.i 1 Aug 2007 03:21:23 -0000 1.2 *************** *** 290,294 **** bool Intersects(const wxGBSizerItem& other) bool Intersects(const wxGBPosition& pos, const wxGBSpan& span) ! void GetEndPos(int& row, int& col) wxGridBagSizer* GetGBSizer() const void SetGBSizer(wxGridBagSizer* sizer) --- 290,298 ---- bool Intersects(const wxGBSizerItem& other) bool Intersects(const wxGBPosition& pos, const wxGBSpan& span) ! ! // %override [row, col] wxGBSizerItem::GetEndPos() ! // C++ Func: void GetEndPos(int& row, int& col) ! void GetEndPos() ! wxGridBagSizer* GetGBSizer() const void SetGBSizer(wxGridBagSizer* sizer) |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:56
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/apps/build/msvc6 Modified Files: apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** apps_app_wxluaedit.dsp 16 Jul 2007 19:34:02 -0000 1.7 --- apps_app_wxluaedit.dsp 1 Aug 2007 03:21:21 -0000 1.8 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" *************** *** 341,346 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" *************** *** 391,396 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Monolithic" --- 391,396 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Monolithic" *************** *** 441,446 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF --- 441,446 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** apps_app_wxluacan.dsp 16 Jul 2007 19:34:02 -0000 1.7 --- apps_app_wxluacan.dsp 1 Aug 2007 03:21:21 -0000 1.8 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Monolithic" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Monolithic" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Monolithic" *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Monolithic" *************** *** 341,346 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug DLL Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.vc 16 Jul 2007 20:29:54 -0000 1.71 --- makefile.vc 1 Aug 2007 03:21:24 -0000 1.72 *************** *** 1024,1039 **** __RUNTIME_LIBS_435 = $(__THREADING) !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif !if "$(SHARED)" == "0" VAR_195 = lib --- 1024,1027 ---- *************** *** 1172,1175 **** --- 1160,1175 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 1686,1690 **** ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_DIR)\lib @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif --- 1686,1690 ---- ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_DIR)\lib @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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 << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.bcc 16 Jul 2007 20:29:53 -0000 1.72 --- makefile.bcc 1 Aug 2007 03:21:23 -0000 1.73 *************** *** 825,840 **** __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_140)\wx.dll !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif !if "$(SHARED)" == "0" VAR_134 = lib --- 825,828 ---- *************** *** 967,970 **** --- 955,970 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 1554,1558 **** ..\..\..\lib\bcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_134) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING_14)$(__RUNTIME_LIBS_15).lib,, | !endif --- 1554,1558 ---- ..\..\..\lib\bcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_134) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING_14)$(__RUNTIME_LIBS_15).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.wat 16 Jul 2007 20:29:54 -0000 1.71 --- makefile.wat 1 Aug 2007 03:21:24 -0000 1.72 *************** *** 391,423 **** !endif !endif - __WXLIB_GL_NAME_p = - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !endif - !endif - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !endif - !endif VAR_135 = !ifeq SHARED 0 --- 391,394 ---- *************** *** 666,669 **** --- 637,669 ---- !endif !endif + __WXLIB_GL_NAME_p = + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib + !endif + !endif + !endif + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib + !endif + !endif + !endif __WXLIB_MEDIA_NAME_p = !ifeq BUILD debug *************** *** 1820,1824 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_137) libpath ..\..\..\lib\wat_$(VAR_135) libpath $(LUA_DIR)\lib @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc system nt_dll --- 1820,1824 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(VAR_137) libpath ..\..\..\lib\wat_$(VAR_135) libpath $(LUA_DIR)\lib @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc system nt_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** makefile.gcc 16 Jul 2007 20:29:53 -0000 1.71 --- makefile.gcc 1 Aug 2007 03:21:23 -0000 1.72 *************** *** 744,775 **** endif endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl - endif - endif - endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl - endif - endif - endif ifeq ($(SHARED),0) VAR_134 = lib --- 744,747 ---- *************** *** 982,985 **** --- 954,985 ---- ifeq ($(WX_MONOLITHIC),0) ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media endif *************** *** 1539,1543 **** ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_134) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 1539,1543 ---- ifeq ($(USE_LUAMODULE),1) ..\..\..\lib\gcc_$(VAR_140)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_134) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** wxlstate.cpp 26 Jul 2007 18:56:39 -0000 1.124 --- wxlstate.cpp 1 Aug 2007 03:21:24 -0000 1.125 *************** *** 2667,2671 **** if (g_wxluatag_wxLuaFunction == stack_tag) { ! wxLuaFunction *pFunction = (wxLuaFunction *)wxlua_ttouserdata(L, stack_idx); return pFunction->GetObject(); } --- 2667,2671 ---- if (g_wxluatag_wxLuaFunction == stack_tag) { ! wxLuaFunction *pFunction = (wxLuaFunction *)wxlua_ttouserdata(L, stack_idx, false); return pFunction->GetObject(); } *************** *** 2673,2677 **** return NULL; else if (wxlua_isderivedclass(L, stack_tag, tag) >= 0) ! return wxlua_ttouserdata(L, stack_idx); } --- 2673,2677 ---- return NULL; else if (wxlua_isderivedclass(L, stack_tag, tag) >= 0) ! return wxlua_ttouserdata(L, stack_idx, false); } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** wxlbind.cpp 26 Jul 2007 18:56:39 -0000 1.88 --- wxlbind.cpp 1 Aug 2007 03:21:24 -0000 1.89 *************** *** 83,89 **** //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction)) { ! wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false); ! ! return wxlFunction->CallMethod(L); } return 0; --- 83,88 ---- //if (wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == g_wxluatag_wxLuaFunction)) { ! wxLuaFunction *f = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false); ! return f->CallMethod(L); } return 0; *************** *** 289,293 **** if ((wxlClass != NULL) && wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == *wxlClass->class_tag)) { ! void *pObject = wxlua_ttouserdata(L, 1); name = lua_tostring(L, 2); // name of the __index method called in lua --- 288,292 ---- if ((wxlClass != NULL) && wxlua_iswxuserdata(L, 1) && (wxlua_ttag(L, 1) == *wxlClass->class_tag)) { ! void *pObject = wxlua_ttouserdata(L, 1, false); name = lua_tostring(L, 2); // name of the __index method called in lua *************** *** 408,412 **** if (!found) { ! void *pObject = wxlua_ttouserdata(L, 1); wxLuaObject* wxlObj = new wxLuaObject(wxlState, 3); wxlua_setderivedmethod(L, pObject, name, wxlObj); --- 407,411 ---- if (!found) { ! void *pObject = wxlua_ttouserdata(L, 1, false); wxLuaObject* wxlObj = new wxLuaObject(wxlState, 3); wxlua_setderivedmethod(L, pObject, name, wxlObj); |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/wxbind/src Modified Files: wxcore_bind.cpp wxcore_sizer.cpp Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: wxcore_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_bind.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_bind.cpp 19 Jul 2007 03:09:46 -0000 1.2 --- wxcore_bind.cpp 1 Aug 2007 03:21:24 -0000 1.3 *************** *** 3834,3838 **** #if wxLUA_USE_wxProcess ! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxKill[] = { &s_wxluaarg_Number, &s_wxluaarg_Integer, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, NULL }; // %function int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError *rc = NULL, int flags = 0) static int LUACALL wxLua_function_wxKill(lua_State *L) --- 3834,3839 ---- #if wxLUA_USE_wxProcess ! static wxLuaArgTag s_wxluatagArray_wxLua_function_wxKill[] = { &s_wxluaarg_Number, &s_wxluaarg_Integer, &s_wxluaarg_Number, NULL }; ! // %override wxLua_function_wxKill // %function int wxKill(long pid, wxSignal sig = wxSIGTERM, wxKillError *rc = NULL, int flags = 0) static int LUACALL wxLua_function_wxKill(lua_State *L) *************** *** 3843,3849 **** int argCount = lua_gettop(L); // int flags = 0 ! int flags = (argCount >= 4 ? (int)wxlua_getnumbertype(L, 4) : 0); // wxKillError rc = NULL ! wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlState.ttouserdata(3) : NULL); // wxSignal sig = wxSIGTERM wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getintegertype(L, 2) : wxSIGTERM); --- 3844,3851 ---- int argCount = lua_gettop(L); // int flags = 0 ! int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : 0); // wxKillError rc = NULL ! wxKillError rc = wxKILL_OK; ! //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlState.ttouserdata(3) : NULL); // wxSignal sig = wxSIGTERM wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getintegertype(L, 2) : wxSIGTERM); *************** *** 3851,3861 **** long pid = (long)wxlua_getnumbertype(L, 1); // call wxKill ! returns = (wxKill(pid, sig, rc, flags)); // push the result number lua_pushnumber(L, returns); ! return 1; } ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxKill[1] = {{ wxLua_function_wxKill, WXLUAMETHOD_CFUNCTION, 1, 4, s_wxluatagArray_wxLua_function_wxKill }}; #endif // wxLUA_USE_wxProcess --- 3853,3865 ---- long pid = (long)wxlua_getnumbertype(L, 1); // call wxKill ! returns = (wxKill(pid, sig, &rc, flags)); // push the result number lua_pushnumber(L, returns); + lua_pushnumber(L, rc); ! return 2; } ! ! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxKill[1] = {{ wxLua_function_wxKill, WXLUAMETHOD_CFUNCTION, 1, 3, s_wxluatagArray_wxLua_function_wxKill }}; #endif // wxLUA_USE_wxProcess Index: wxcore_sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_sizer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_sizer.cpp 22 Jul 2007 04:38:29 -0000 1.2 --- wxcore_sizer.cpp 1 Aug 2007 03:21:24 -0000 1.3 *************** *** 4262,4284 **** int s_wxluatag_wxGBSizerItem = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGBSizerItem_GetEndPos[] = { &s_wxluatag_wxGBSizerItem, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, NULL }; static int LUACALL wxLua_wxGBSizerItem_GetEndPos(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGBSizerItem_GetEndPos[1] = {{ wxLua_wxGBSizerItem_GetEndPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxGBSizerItem_GetEndPos }}; // void GetEndPos(int& row, int& col) static int LUACALL wxLua_wxGBSizerItem_GetEndPos(lua_State *L) { wxLuaState wxlState(L); ! // int col ! int * col = (int *)wxlState.ttouserdata(3); ! // int row ! int * row = (int *)wxlState.ttouserdata(2); // get this wxGBSizerItem * self = (wxGBSizerItem *)wxlState.GetUserDataType(1, s_wxluatag_wxGBSizerItem); // call GetEndPos ! self->GetEndPos(*row, *col); ! ! return 0; } static wxLuaArgTag s_wxluatagArray_wxLua_wxGBSizerItem_GetGBSizer[] = { &s_wxluatag_wxGBSizerItem, NULL }; static int LUACALL wxLua_wxGBSizerItem_GetGBSizer(lua_State *L); --- 4262,4285 ---- int s_wxluatag_wxGBSizerItem = -1; ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGBSizerItem_GetEndPos[] = { &s_wxluatag_wxGBSizerItem, NULL }; static int LUACALL wxLua_wxGBSizerItem_GetEndPos(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxGBSizerItem_GetEndPos[1] = {{ wxLua_wxGBSizerItem_GetEndPos, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxGBSizerItem_GetEndPos }}; ! // %override wxLua_wxGBSizerItem_GetEndPos // void GetEndPos(int& row, int& col) static int LUACALL wxLua_wxGBSizerItem_GetEndPos(lua_State *L) { wxLuaState wxlState(L); ! int col = 0; ! int row = 0; // get this wxGBSizerItem * self = (wxGBSizerItem *)wxlState.GetUserDataType(1, s_wxluatag_wxGBSizerItem); // call GetEndPos ! self->GetEndPos(row, col); ! lua_pushnumber(L, row); ! lua_pushnumber(L, col); ! return 2; } + static wxLuaArgTag s_wxluatagArray_wxLua_wxGBSizerItem_GetGBSizer[] = { &s_wxluatag_wxGBSizerItem, NULL }; static int LUACALL wxLua_wxGBSizerItem_GetGBSizer(lua_State *L); |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:27
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_luamodule.vcproj 16 Jul 2007 19:34:32 -0000 1.5 --- modules_mod_luamodule.vcproj 1 Aug 2007 03:21:23 -0000 1.6 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 59,63 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 59,63 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 76,80 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 76,80 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 127,131 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 127,131 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 144,148 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 144,148 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> |
|
From: John L. <jr...@us...> - 2007-08-01 03:21:27
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14531/wxLua/modules/build/msvc6 Modified Files: modules_mod_luamodule.dsp Log Message: Add the gl lib as a default fix some bindings that take int *var and return the value Index: modules_mod_luamodule.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_luamodule.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_luamodule.dsp 16 Jul 2007 19:34:32 -0000 1.5 --- modules_mod_luamodule.dsp 1 Aug 2007 03:21:23 -0000 1.6 *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Monolithic" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Monolithic" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Monolithic" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Monolithic" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Monolithic" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Monolithic" *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ENDIF |
|
From: John L. <jr...@us...> - 2007-07-31 23:31:00
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26124/wxbind/src Modified Files: wxhtml_wxlhtmlwin.cpp Log Message: Need WXDLLEXP symbol when using extern int ..., just include header. Index: wxhtml_wxlhtmlwin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxhtml_wxlhtmlwin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxhtml_wxlhtmlwin.cpp 19 Jul 2007 03:09:46 -0000 1.2 --- wxhtml_wxlhtmlwin.cpp 31 Jul 2007 23:30:57 -0000 1.3 *************** *** 21,34 **** #include "wxbind/include/wxhtml_wxlhtmlwin.h" //#include "wxlua/include/wxlcallb.h" #if wxLUA_USE_wxHTML - // These are the wxLua tags defined in wxbind - extern int s_wxluatag_wxLuaHtmlWindow; - extern int s_wxluatag_wxHtmlCell; - extern int s_wxluatag_wxMouseEvent; - extern int s_wxluatag_wxHtmlLinkInfo; - DEFINE_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER) --- 21,30 ---- #include "wxbind/include/wxhtml_wxlhtmlwin.h" + #include "wxbind/include/wxhtml_bind.h" + //#include "wxlua/include/wxlcallb.h" #if wxLUA_USE_wxHTML DEFINE_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER) |
|
From: John L. <jr...@us...> - 2007-07-31 23:15:16
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15425/bakefiles Modified Files: wxluabase.bkl Log Message: Link to gl lib by default Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxluabase.bkl 16 Jul 2007 19:34:28 -0000 1.41 --- wxluabase.bkl 31 Jul 2007 23:15:12 -0000 1.42 *************** *** 170,173 **** --- 170,174 ---- <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> + <wx-lib>gl</wx-lib> <wx-lib>aui</wx-lib> <wx-lib>media</wx-lib> |
|
From: John L. <jr...@us...> - 2007-07-31 21:16:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19414/wxLua/bindings/wxwidgets Modified Files: wxcore_clipdrag.i Log Message: Update comment for EVT_TEXT_XXX Index: wxcore_clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_clipdrag.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_clipdrag.i 16 Jul 2007 19:34:24 -0000 1.1 --- wxcore_clipdrag.i 31 Jul 2007 21:16:40 -0000 1.2 *************** *** 48,53 **** %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY // EVT_TEXT_CUT(winid, func) ! %define_event wxEVT_COMMAND_TEXT_CUT // EVT_TEXT_COPY(winid, func) %define_event wxEVT_COMMAND_TEXT_PASTE // EVT_TEXT_PASTE(winid, func) --- 48,53 ---- %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY // EVT_TEXT_COPY(winid, func) ! %define_event wxEVT_COMMAND_TEXT_CUT // EVT_TEXT_CUT(winid, func) %define_event wxEVT_COMMAND_TEXT_PASTE // EVT_TEXT_PASTE(winid, func) |
|
From: John L. <jr...@us...> - 2007-07-31 21:16:43
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19414/wxLua/docs Modified Files: wxluaref.html Log Message: Update comment for EVT_TEXT_XXX Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxluaref.html 16 Jul 2007 19:34:29 -0000 1.41 --- wxluaref.html 31 Jul 2007 21:16:40 -0000 1.42 *************** *** 1874,1887 **** <td> <tr> - <td><a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a> - <td bgcolor=FFAAAA> - <td align="center" bgcolor=AAFFAA>X - <td> - <tr> - <td><a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a> - <td bgcolor=FFAAAA> - <td align="center" bgcolor=AAFFAA>X - <td> - <tr> <td><a href="#wxLuaHtmlWinTagEvent">wxLuaHtmlWinTagEvent</a> <td bgcolor=FFAAAA> --- 1874,1877 ---- *************** *** 1904,1912 **** <td> <tr> - <td><a href="#wxLuaState">wxLuaState</a> - <td bgcolor=FFAAAA> - <td align="center" bgcolor=AAFFAA>X - <td> - <tr> <td><a href="#wxLuaTreeItemData">wxLuaTreeItemData</a> <td bgcolor=FFAAAA> --- 1894,1897 ---- *************** *** 3412,3417 **** <a href="#wxLocaleInfo">wxLocaleInfo</a><br> <a href="#wxLocaleInitFlags">wxLocaleInitFlags</a><br> - <a href="#wxLuaMethod_Type">wxLuaMethod_Type</a><br> - <a href="#wxLuaObject_Type">wxLuaObject_Type</a><br> <a href="#wxMediaCtrlPlayerControls">wxMediaCtrlPlayerControls</a><br> <a href="#wxMediaState">wxMediaState</a><br> --- 3397,3400 ---- *************** *** 7008,7013 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxClipboardTextEvent">wxClipboardTextEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> <blockquote> ! <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_COPY <font color=#009900>// EVT_TEXT_CUT(winid, func)</font></font><br> ! <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_CUT <font color=#009900>// EVT_TEXT_COPY(winid, func)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_PASTE <font color=#009900>// EVT_TEXT_PASTE(winid, func)</font></font><br> <br> --- 6991,6996 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxClipboardTextEvent">wxClipboardTextEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> <blockquote> ! <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_COPY <font color=#009900>// EVT_TEXT_COPY(winid, func)</font></font><br> ! <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_CUT <font color=#009900>// EVT_TEXT_CUT(winid, func)</font></font><br> <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_TEXT_PASTE <font color=#009900>// EVT_TEXT_PASTE(winid, func)</font></font><br> <br> *************** *** 16504,16508 **** <br> int GetOldSelection() const<br> ! <font color=#009900>//int GetSelection() const : see <a href="#wxCommandEvent">wxCommandEvent</a></font><br> void SetOldSelection(int page)<br> void SetSelection(int page)<br> --- 16487,16491 ---- <br> int GetOldSelection() const<br> ! int GetSelection() const <font color=#009900>// note : must override <a href="#wxCommandEvent">wxCommandEvent</a> func since it's not virtual</font><br> void SetOldSelection(int page)<br> void SetSelection(int page)<br> *************** *** 24391,24395 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLuaState">wxLuaState</a></font><br> <br> <i>%include</i> "wxlua/include/wxlstate.h"<br> --- 24374,24378 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// wxLuaState</font><br> <br> <i>%include</i> "wxlua/include/wxlstate.h"<br> *************** *** 24398,24403 **** <blockquote> <font color=#888888>/*<br> ! <a href="#wxLuaState">wxLuaState</a>(bool create = false)<br> ! <a href="#wxLuaState">wxLuaState</a>(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br> <br> bool Ok() const<br> --- 24381,24386 ---- <blockquote> <font color=#888888>/*<br> ! wxLuaState(bool create = false)<br> ! wxLuaState(<a href="#wxEvtHandler">wxEvtHandler</a> *handler, wxWindowID id = wxID_ANY)<br> <br> bool Ok() const<br> *************** *** 24436,24440 **** <blockquote> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const <a href="#wxLuaState">wxLuaState</a>& wxlState, int stack_idx = 1)</font><br> <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br> <a href="#wxLuaObject">wxLuaObject</a>()<br> --- 24419,24423 ---- <blockquote> <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxLuaObject">wxLuaObject</a>(any value type)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxLuaObject">wxLuaObject</a>(const wxLuaState& wxlState, int stack_idx = 1)</font><br> <font color=#009900>// Wrap the single value passed in with a <a href="#wxLuaObject">wxLuaObject</a></font><br> <a href="#wxLuaObject">wxLuaObject</a>()<br> *************** *** 24492,24496 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> ! <a href="#wxLuaDebuggerServer">wxLuaDebuggerServer</a>(int portNumber)<br> <br> bool StartServer()<br> --- 24475,24479 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerServer">wxLuaDebuggerServer</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> ! wxLuaDebuggerServer(int portNumber)<br> <br> bool StartServer()<br> *************** *** 24526,24530 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLuaDebuggerEvent">wxLuaDebuggerEvent</a></font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b> --- 24509,24513 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// wxLuaDebuggerEvent</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaDebuggerEvent">wxLuaDebuggerEvent</a>, <a href="#wxEvent">wxEvent</a></font></b> |
|
From: John L. <jr...@us...> - 2007-07-31 20:54:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10102/wxLua/modules/wxbind/src Modified Files: wxbase_data.cpp Log Message: Only push the value for wxObject:DynamicCast if params are ok Only enable the stack dialog when we're not running a program Index: wxbase_data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_data.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_data.cpp 22 Jul 2007 04:38:28 -0000 1.2 --- wxbase_data.cpp 31 Jul 2007 20:54:02 -0000 1.3 *************** *** 607,613 **** int iResult = 0; const char *className = lua_tostring(L, 2); - lua_pushvalue(L, 1); if (className != NULL) { wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); --- 607,613 ---- int iResult = 0; const char *className = lua_tostring(L, 2); if (className != NULL) { + lua_pushvalue(L, 1); wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); *************** *** 625,632 **** if (iResult == 0) ! wxlState.terror("wxLua: DynamicCast: Class not found."); } else ! wxlState.terror("wxLua: DynamicCast: Incorrect number of parameters."); return iResult; --- 625,632 ---- if (iResult == 0) ! wxlState.terror("wxObject:DynamicCast: Class not found."); } else ! wxlState.terror("wxObject:DynamicCast: Expected a string name of the class for parameter 2."); return iResult; |
|
From: John L. <jr...@us...> - 2007-07-31 20:54:05
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10102/wxLua/bindings/wxwidgets Modified Files: wxbase_override.hpp Log Message: Only push the value for wxObject:DynamicCast if params are ok Only enable the stack dialog when we're not running a program Index: wxbase_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_override.hpp 22 Jul 2007 04:38:28 -0000 1.2 --- wxbase_override.hpp 31 Jul 2007 20:54:02 -0000 1.3 *************** *** 421,427 **** int iResult = 0; const char *className = lua_tostring(L, 2); - lua_pushvalue(L, 1); if (className != NULL) { wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); --- 421,427 ---- int iResult = 0; const char *className = lua_tostring(L, 2); if (className != NULL) { + lua_pushvalue(L, 1); wxObject *pObject = (wxObject *)wxlState.ttouserdata( 1 ); *************** *** 439,446 **** if (iResult == 0) ! wxlState.terror("wxLua: DynamicCast: Class not found."); } else ! wxlState.terror("wxLua: DynamicCast: Incorrect number of parameters."); return iResult; --- 439,446 ---- if (iResult == 0) ! wxlState.terror("wxObject:DynamicCast: Class not found."); } else ! wxlState.terror("wxObject:DynamicCast: Expected a string name of the class for parameter 2."); return iResult; |
|
From: John L. <jr...@us...> - 2007-07-31 20:54:05
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10102/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp Log Message: Only push the value for wxObject:DynamicCast if params are ok Only enable the stack dialog when we're not running a program Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxledit.cpp 24 May 2007 00:59:43 -0000 1.32 --- wxledit.cpp 31 Jul 2007 20:54:02 -0000 1.33 *************** *** 316,320 **** wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_RUN_LUA, !is_running); wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_BREAK_LUA, is_running); ! wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_SHOW_STACK, wxlState.Ok()); wxSTEditor::UpdateItems(menu, menuBar, toolBar); --- 316,320 ---- wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_RUN_LUA, !is_running); wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_BREAK_LUA, is_running); ! wxSTEditorMenuManager::DoEnableItem(menu, menuBar, toolBar, ID_WXLUAIDE_SHOW_STACK, wxlState.Ok() && !is_running); wxSTEditor::UpdateItems(menu, menuBar, toolBar); |
|
From: John L. <jr...@us...> - 2007-07-31 20:51:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8879/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h Log Message: Add back the old #ifdef checks #if defined(WXMAKINGDLL_BINDWXADV) || defined(WXMAKINGDLL_WXBINDADV) We should use WXMAKINGDLL_BINDWXADV, but this will work for now Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxbinddefs.h 17 Jul 2007 23:09:17 -0000 1.6 --- wxbinddefs.h 31 Jul 2007 20:51:21 -0000 1.7 *************** *** 18,22 **** // ---------------------------------------------------------------------------- ! #ifdef WXMAKINGDLL_BINDWXADV #define WXDLLIMPEXP_BINDWXADV WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXADV(type) WXEXPORT type --- 18,22 ---- // ---------------------------------------------------------------------------- ! #if defined(WXMAKINGDLL_BINDWXADV) || defined(WXMAKINGDLL_WXBINDADV) #define WXDLLIMPEXP_BINDWXADV WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXADV(type) WXEXPORT type *************** *** 29,33 **** #endif ! #ifdef WXMAKINGDLL_BINDWXAUI #define WXDLLIMPEXP_BINDWXAUI WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXAUI(type) WXEXPORT type --- 29,33 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXAUI) || defined(WXMAKINGDLL_WXBINDAUI) #define WXDLLIMPEXP_BINDWXAUI WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXAUI(type) WXEXPORT type *************** *** 40,44 **** #endif ! #ifdef WXMAKINGDLL_BINDWXBASE #define WXDLLIMPEXP_BINDWXBASE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXBASE(type) WXEXPORT type --- 40,44 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXBASE) || defined(WXMAKINGDLL_WXBINDBASE) #define WXDLLIMPEXP_BINDWXBASE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXBASE(type) WXEXPORT type *************** *** 51,55 **** #endif ! #ifdef WXMAKINGDLL_BINDWXCORE #define WXDLLIMPEXP_BINDWXCORE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXCORE(type) WXEXPORT type --- 51,55 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXCORE) || defined(WXMAKINGDLL_WXBINDCORE) #define WXDLLIMPEXP_BINDWXCORE WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXCORE(type) WXEXPORT type *************** *** 62,66 **** #endif ! #ifdef WXMAKINGDLL_BINDWXGL #define WXDLLIMPEXP_BINDWXGL WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXGL(type) WXEXPORT type --- 62,66 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXGL) || defined(WXMAKINGDLL_WXBINDGL) #define WXDLLIMPEXP_BINDWXGL WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXGL(type) WXEXPORT type *************** *** 73,77 **** #endif ! #ifdef WXMAKINGDLL_BINDWXHTML #define WXDLLIMPEXP_BINDWXHTML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXHTML(type) WXEXPORT type --- 73,77 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXHTML) || defined(WXMAKINGDLL_WXBINDHTML) #define WXDLLIMPEXP_BINDWXHTML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXHTML(type) WXEXPORT type *************** *** 84,88 **** #endif ! #ifdef WXMAKINGDLL_BINDWXMEDIA #define WXDLLIMPEXP_BINDWXMEDIA WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXMEDIA(type) WXEXPORT type --- 84,88 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXMEDIA) || defined(WXMAKINGDLL_WXBINDMEDIA) #define WXDLLIMPEXP_BINDWXMEDIA WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXMEDIA(type) WXEXPORT type *************** *** 95,99 **** #endif ! #ifdef WXMAKINGDLL_BINDWXNET #define WXDLLIMPEXP_BINDWXNET WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXNET(type) WXEXPORT type --- 95,99 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXNET) || defined(WXMAKINGDLL_WXBINDNET) #define WXDLLIMPEXP_BINDWXNET WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXNET(type) WXEXPORT type *************** *** 106,110 **** #endif ! #ifdef WXMAKINGDLL_BINDWXRICHTEXT #define WXDLLIMPEXP_BINDWXRICHTEXT WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXRICHTEXT(type) WXEXPORT type --- 106,110 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXRICHTEXT) || defined(WXMAKINGDLL_WXBINDRICHTEXT) #define WXDLLIMPEXP_BINDWXRICHTEXT WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXRICHTEXT(type) WXEXPORT type *************** *** 117,121 **** #endif ! #ifdef WXMAKINGDLL_BINDWXSTC #define WXDLLIMPEXP_BINDWXSTC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXSTC(type) WXEXPORT type --- 117,121 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXSTC) || defined(WXMAKINGDLL_WXBINDSTC) #define WXDLLIMPEXP_BINDWXSTC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXSTC(type) WXEXPORT type *************** *** 128,132 **** #endif ! #ifdef WXMAKINGDLL_BINDWXXML #define WXDLLIMPEXP_BINDWXXML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXML(type) WXEXPORT type --- 128,132 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXXML) || defined(WXMAKINGDLL_WXBINDXML) #define WXDLLIMPEXP_BINDWXXML WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXML(type) WXEXPORT type *************** *** 139,143 **** #endif ! #ifdef WXMAKINGDLL_BINDWXXRC #define WXDLLIMPEXP_BINDWXXRC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXRC(type) WXEXPORT type --- 139,143 ---- #endif ! #if defined(WXMAKINGDLL_BINDWXXRC) || defined(WXMAKINGDLL_WXBINDXRC) #define WXDLLIMPEXP_BINDWXXRC WXEXPORT #define WXDLLIMPEXP_DATA_BINDWXXRC(type) WXEXPORT type |
|
From: John L. <jr...@us...> - 2007-07-30 02:26:48
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13434/wxLua/modules/wxbind/src Modified Files: wxcore_windows.cpp Log Message: Must have wxBookCtrlBaseEvent::GetSelection since it is not vitrual from wxCommandEvent Index: wxcore_windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_windows.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxcore_windows.cpp 22 Jul 2007 04:38:29 -0000 1.2 --- wxcore_windows.cpp 30 Jul 2007 02:26:44 -0000 1.3 *************** *** 6048,6051 **** --- 6048,6069 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, NULL }; + static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection[1] = {{ wxLua_wxBookCtrlBaseEvent_GetSelection, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection }}; + // int GetSelection() const // note : must override wxCommandEvent func since it's not virtual + static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxBookCtrlBaseEvent * self = (wxBookCtrlBaseEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBaseEvent); + // call GetSelection + returns = (self->GetSelection()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_SetOldSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxBookCtrlBaseEvent_SetOldSelection(lua_State *L); *************** *** 6133,6136 **** --- 6151,6155 ---- wxLuaBindMethod wxBookCtrlBaseEvent_methods[] = { { "GetOldSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetOldSelection, 1, NULL }, + { "GetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection, 1, NULL }, { "SetOldSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetOldSelection, 1, NULL }, { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetSelection, 1, NULL }, |
|
From: John L. <jr...@us...> - 2007-07-28 22:52:30
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1779/bindings/wxwidgets Modified Files: wxcore_windows.i Log Message: wxBookCtrlBase::GetSelection is not virtual from wxCommandEvent, must explicitly create func for it Index: wxcore_windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_windows.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_windows.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_windows.i 28 Jul 2007 22:52:26 -0000 1.2 *************** *** 459,463 **** int GetOldSelection() const ! //int GetSelection() const : see wxCommandEvent void SetOldSelection(int page) void SetSelection(int page) --- 459,463 ---- int GetOldSelection() const ! int GetSelection() const // note : must override wxCommandEvent func since it's not virtual void SetOldSelection(int page) void SetSelection(int page) |
|
From: Francesco M. <fr...@us...> - 2007-07-28 21:21:52
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31703/build/autoconf Modified Files: aclocal.m4 Log Message: regenerated configure script with working frm-bakefile Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** aclocal.m4 27 Jul 2007 13:33:41 -0000 1.47 --- aclocal.m4 28 Jul 2007 21:21:41 -0000 1.48 *************** *** 12,21 **** # PARTICULAR PURPOSE. ! dnl --------------------------------------------------------------------------- ! dnl Support macros for makefiles generated by BAKEFILE. ! dnl --------------------------------------------------------------------------- dnl Lots of compiler & linker detection code contained here was taken from ! dnl wxWindows configure.in script (see http://www.wxwindows.org) [...1438 lines suppressed...] if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then ! echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi ! ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi *************** *** 1501,1505 **** #!/bin/sh ! # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf # script. It is used to generated precompiled headers. # --- 1570,1574 ---- #!/bin/sh ! # This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to generated precompiled headers. # |
