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...> - 2008-01-15 00:08:54
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13559/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: regenerated all makefiles with bakefile 0.2.3 RC2 Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.vc 9 Jan 2008 04:59:57 -0000 1.73 --- makefile.vc 15 Jan 2008 00:08:18 -0000 1.74 *************** *** 1,608 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...1187 lines suppressed...] ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\canlua.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\cansim.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\wxluacan.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\wxluacan_bind.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAFREEZE_CXXFLAGS) ..\..\wxluafreeze\src\wxluafreeze.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc ! Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.bcc 9 Jan 2008 04:59:57 -0000 1.73 --- makefile.bcc 15 Jan 2008 00:08:18 -0000 1.74 *************** *** 1,624 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! .autodepend ! ! !ifndef BCCDIR ! !ifndef MAKEDIR [...1219 lines suppressed...] ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\canlua.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\cansim.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\wxluacan.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) ..\..\wxluacan\src\wxluacan_bind.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUAFREEZE_CXXFLAGS) ..\..\wxluafreeze\src\wxluafreeze.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include ..\..\wxluafreeze\src\wxluafreeze.rc ! Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.wat 9 Jan 2008 04:59:57 -0000 1.74 --- makefile.wat 15 Jan 2008 00:08:18 -0000 1.75 *************** *** 1,814 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...1599 lines suppressed...] ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj : .AUTODEPEND ..\..\wxluacan\src\cansim.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUAFREEZE_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include $< ! Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.gcc 9 Jan 2008 04:59:57 -0000 1.73 --- makefile.gcc 15 Jan 2008 00:08:18 -0000 1.74 *************** *** 1,706 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...1385 lines suppressed...] ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir ../../../modules/wxbind/setup ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp ! $(CXX) -c -o $@ $(APP_WXLUAFREEZE_CXXFLAGS) $(CPPDEPS) $< ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include ! ! .PHONY: all clean ! ! ! SHELL := $(COMSPEC) ! ! # Dependencies tracking: ! -include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:08:53
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13559/modules Modified Files: Makefile.in Log Message: regenerated all makefiles with bakefile 0.2.3 RC2 Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Makefile.in 10 Jan 2008 23:06:24 -0000 1.65 --- Makefile.in 15 Jan 2008 00:08:19 -0000 1.66 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! [...1160 lines suppressed...] @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxldserv.h wxluasocket/include/wxldtarg.h wxluasocket/include/wxlsock.h wxluasocket/include/wxluasocket_bind.h wxluasocket/include/wxluasocketdefs.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done --- 2772,2776 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in $(WXLUASOCKET_DLL_HEADERS); do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done *************** *** 3391,3393 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_lib_headers uninstall_lua_lib_headers install_lua_dll uninstall_lua_dll install_lua_dll_headers uninstall_lua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbindadv_lib uninstall_wxbindadv_lib install_wxbindadv_lib_headers uninstall_wxbindadv_lib_headers install_wxbindadv_dll uninstall_wxbindadv_dll install_wxbindadv_dll_headers uninstall_wxbindadv_dll_headers install_wxbindaui_lib uninstall_wxbindaui_lib install_wxbindaui_lib_headers uninstall_wxbindaui_lib_headers install_wxbindaui_dll uninstall_wxbindaui_dll install_wxbindaui_dll_headers uninstall_wxbindaui_dll_headers install_wxbindbase_lib uninstall_wxbindbase_lib install_wxbindbase_lib_headers uninstall_wxbindbase_lib_headers install_wxbindbase_dll uninstall_wxbindbase_dll install_wxbindbase_dll_headers uninstall_wxbindbase_dll_headers install_wxbindcore_lib uninstall_wxbindcore_lib install_wxbindcore_lib_headers uninstall_wxbindcore_lib_headers install_wxbindcore_dll uninstall_wxbindcore_dll install_wxbindcore_dll_headers uninstall_wxbindcore_dll_headers install_wxbindgl_lib uninstall_wxbindgl_lib install_wxbindgl_lib_headers uninstall_wxbindgl_lib_headers install_wxbindgl_dll uninstall_wxbindgl_dll install_wxbindgl_dll_headers uninstall_wxbindgl_dll_headers install_wxbindhtml_lib uninstall_wxbindhtml_lib install_wxbindhtml_lib_headers uninstall_wxbindhtml_lib_headers install_wxbindhtml_dll uninstall_wxbindhtml_dll install_wxbindhtml_dll_headers uninstall_wxbindhtml_dll_headers install_wxbindmedia_lib uninstall_wxbindmedia_lib install_wxbindmedia_lib_headers uninstall_wxbindmedia_lib_headers install_wxbindmedia_dll uninstall_wxbindmedia_dll install_wxbindmedia_dll_headers uninstall_wxbindmedia_dll_headers install_wxbindnet_lib uninstall_wxbindnet_lib install_wxbindnet_lib_headers uninstall_wxbindnet_lib_headers install_wxbindnet_dll uninstall_wxbindnet_dll install_wxbindnet_dll_headers uninstall_wxbindnet_dll_headers install_wxbindrichtext_lib uninstall_wxbindrichtext_lib install_wxbindrichtext_lib_headers uninstall_wxbindrichtext_lib_headers install_wxbindrichtext_dll uninstall_wxbindrichtext_dll install_wxbindrichtext_dll_headers uninstall_wxbindrichtext_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxbindxml_lib uninstall_wxbindxml_lib install_wxbindxml_lib_headers uninstall_wxbindxml_lib_headers install_wxbindxml_dll uninstall_wxbindxml_dll install_wxbindxml_dll_headers uninstall_wxbindxml_dll_headers install_wxbindxrc_lib uninstall_wxbindxrc_lib install_wxbindxrc_lib_headers uninstall_wxbindxrc_lib_headers install_wxbindxrc_dll uninstall_wxbindxrc_dll install_wxbindxrc_dll_headers uninstall_wxbindxrc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup --- 3447,3449 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_dll uninstall_lua_dll install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbindadv_lib uninstall_wxbindadv_lib install_wxbindadv_lib_headers uninstall_wxbindadv_lib_headers install_wxbindadv_dll uninstall_wxbindadv_dll install_wxbindadv_dll_headers uninstall_wxbindadv_dll_headers install_wxbindaui_lib uninstall_wxbindaui_lib install_wxbindaui_lib_headers uninstall_wxbindaui_lib_headers install_wxbindaui_dll uninstall_wxbindaui_dll install_wxbindaui_dll_headers uninstall_wxbindaui_dll_headers install_wxbindbase_lib uninstall_wxbindbase_lib install_wxbindbase_lib_headers uninstall_wxbindbase_lib_headers install_wxbindbase_dll uninstall_wxbindbase_dll install_wxbindbase_dll_headers uninstall_wxbindbase_dll_headers install_wxbindcore_lib uninstall_wxbindcore_lib install_wxbindcore_lib_headers uninstall_wxbindcore_lib_headers install_wxbindcore_dll uninstall_wxbindcore_dll install_wxbindcore_dll_headers uninstall_wxbindcore_dll_headers install_wxbindgl_lib uninstall_wxbindgl_lib install_wxbindgl_lib_headers uninstall_wxbindgl_lib_headers install_wxbindgl_dll uninstall_wxbindgl_dll install_wxbindgl_dll_headers uninstall_wxbindgl_dll_headers install_wxbindhtml_lib uninstall_wxbindhtml_lib install_wxbindhtml_lib_headers uninstall_wxbindhtml_lib_headers install_wxbindhtml_dll uninstall_wxbindhtml_dll install_wxbindhtml_dll_headers uninstall_wxbindhtml_dll_headers install_wxbindmedia_lib uninstall_wxbindmedia_lib install_wxbindmedia_lib_headers uninstall_wxbindmedia_lib_headers install_wxbindmedia_dll uninstall_wxbindmedia_dll install_wxbindmedia_dll_headers uninstall_wxbindmedia_dll_headers install_wxbindnet_lib uninstall_wxbindnet_lib install_wxbindnet_lib_headers uninstall_wxbindnet_lib_headers install_wxbindnet_dll uninstall_wxbindnet_dll install_wxbindnet_dll_headers uninstall_wxbindnet_dll_headers install_wxbindrichtext_lib uninstall_wxbindrichtext_lib install_wxbindrichtext_lib_headers uninstall_wxbindrichtext_lib_headers install_wxbindrichtext_dll uninstall_wxbindrichtext_dll install_wxbindrichtext_dll_headers uninstall_wxbindrichtext_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxbindxml_lib uninstall_wxbindxml_lib install_wxbindxml_lib_headers uninstall_wxbindxml_lib_headers install_wxbindxml_dll uninstall_wxbindxml_dll install_wxbindxml_dll_headers uninstall_wxbindxml_dll_headers install_wxbindxrc_lib uninstall_wxbindxrc_lib install_wxbindxrc_lib_headers uninstall_wxbindxrc_lib_headers install_wxbindxrc_dll uninstall_wxbindxrc_dll install_wxbindxrc_dll_headers uninstall_wxbindxrc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:08:53
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13559/apps/build/msvc8 Modified Files: apps.sln apps_app_lua.vcproj apps_app_luac.vcproj apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: regenerated all makefiles with bakefile 0.2.3 RC2 Index: apps_app_luac.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_luac.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps_app_luac.vcproj 8 May 2007 18:26:17 -0000 1.1 --- apps_app_luac.vcproj 15 Jan 2008 00:08:17 -0000 1.2 *************** *** 1,183 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_luac" ProjectGUID="{50EEE281-856E-5AD8-9E06-E0A15E37B4C5}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> ! <Platform Name="Win32"/> ! </Platforms> ! <ToolFiles> ! ! </ToolFiles> ! <Configurations> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_luac" Name="Release Unicode Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_luac\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_luac\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_luac" Name="Release Unicode Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_luac\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_luac\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_luac" Name="Release Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_luac\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_luac\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_luac" Name="Release Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_luac\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_luac\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_luac" Name="Debug Unicode Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_luac\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_luac\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.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\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_luac" Name="Debug Unicode Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_luac\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_luac\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.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\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswd\app_luac" Name="Debug Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd\app_luac\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd\app_luac\" Optimization="0" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.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\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswd\app_luac" Name="Debug Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> ! <Tool Name="VCPreBuildEventTool"/> ! <Tool Name="VCCustomBuildTool"/> ! <Tool Name="VCXMLDataGeneratorTool"/> ! <Tool Name="VCWebServiceProxyGeneratorTool"/> ! <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd\app_luac\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd\app_luac\" Optimization="0" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> ! <Tool Name="VCManagedResourceCompilerTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> ! <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 lua5.1.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\luac.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> ! <Tool Name="VCALinkTool"/> ! <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_luac.bsc" SuppressStartupBanner="true"/> ! <Tool Name="VCFxCopTool"/> ! <Tool Name="VCAppVerifierTool"/> ! <Tool Name="VCWebDeploymentTool"/> ! <Tool Name="VCPostBuildEventTool"/> ! </Configuration> ! </Configurations> ! <References> ! ! </References> ! <Files> ! <Filter Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Name="Source Files" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> ! <File RelativePath="..\..\..\modules\lua\src\luac.c"/> ! <File RelativePath="..\..\..\modules\lua\src\print.c"/> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! --- 1,790 ---- ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.3 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="app_luac" ! ProjectGUID="{50EEE281-856E-5AD8-9E06-E0A15E37B4C5}" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Release Unicode Monolithic|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswu\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="false" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ! BasicRuntimeChecks="0" ! DebugInformationFormat="0" ! BufferSecurityCheck="false" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswu\app_luac\" ! ObjectFile="vcmswu\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="1" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release Unicode Multilib|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswu\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="false" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ! BasicRuntimeChecks="0" ! DebugInformationFormat="0" ! BufferSecurityCheck="false" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswu\app_luac\" ! ObjectFile="vcmswu\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="1" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release Monolithic|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmsw\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="false" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" ! BasicRuntimeChecks="0" ! DebugInformationFormat="0" ! BufferSecurityCheck="false" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmsw\app_luac\" ! ObjectFile="vcmsw\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="1" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release Multilib|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmsw\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="false" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" ! BasicRuntimeChecks="0" ! DebugInformationFormat="0" ! BufferSecurityCheck="false" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmsw\app_luac\" ! ObjectFile="vcmsw\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="1" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug Unicode Monolithic|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswud\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="true" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! BasicRuntimeChecks="3" ! DebugInformationFormat="3" ! Detect64BitPortabilityProblems="true" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswud\app_luac\" ! ObjectFile="vcmswud\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="2" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug Unicode Multilib|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswud\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! CharacterSet="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="true" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! BasicRuntimeChecks="3" ! DebugInformationFormat="3" ! Detect64BitPortabilityProblems="true" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswud\app_luac\" ! ObjectFile="vcmswud\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="2" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug Monolithic|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswd\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="true" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! BasicRuntimeChecks="3" ! DebugInformationFormat="3" ! Detect64BitPortabilityProblems="true" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswd\app_luac\" ! ObjectFile="vcmswd\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="2" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug Multilib|Win32" ! OutputDirectory="..\..\..\bin\vc_lib" ! IntermediateDirectory="vcmswd\app_luac" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="false" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! MinimalRebuild="true" ! ExceptionHandling="1" ! AdditionalOptions="" ! RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! BasicRuntimeChecks="3" ! DebugInformationFormat="3" ! Detect64BitPortabilityProblems="true" ! RuntimeTypeInfo="true" ! AssemblerListingLocation="vcmswd\app_luac\" ! ObjectFile="vcmswd\app_luac\" ! ProgramDataBaseFileName="..\..\..\bin\vc_lib\luac.pdb" ! WarningLevel="1" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! Culture="1033" ! AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="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 lua5.1.lib" ! AdditionalOptions="" ! OutputFile="..\..\..\bin\vc_lib\luac.exe" ! LinkIncremental="2" ! SubSystem="1" ! SuppressStartupBanner="true" ! AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib;..\..\..\lib\vc_lib;..\..\..\modules\lua\lib" ! GenerateManifest="true" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="..\..\..\bin\vc_lib\luac.pdb" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! OutputFile="..\..\..\bin\vc_lib\apps_app_luac.bsc" ! SuppressStartupBanner="true" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! ! </References> ! <Files> ! <Filter ! Name="Source Files" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ! Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" ! > ! <File ! RelativePath="..\..\..\modules\lua\src\luac.c" ! /> ! <File ! RelativePath="..\..\..\modules\lua\src\print.c" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps_app_wxluacan.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluacan.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** apps_app_wxluacan.vcproj 1 Aug 2007 03:21:22 -0000 1.8 --- apps_app_wxluacan.vcproj 15 Jan 2008 00:08:17 -0000 1.9 *************** *** 1,347 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_wxluacan" ProjectGUID="{30A66F03-5391-5C18-8EE8-E2996DB1512B}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> [...1888 lines suppressed...] ! /> ! <File ! RelativePath="..\..\wxluacan\src\wxluacan.h" ! /> ! </Filter> ! <Filter ! Name="Resource Files" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" ! > ! <File ! RelativePath="..\..\wxluacan\src\cansim.rc" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** apps_app_wxlua.vcproj 1 Aug 2007 03:21:22 -0000 1.8 --- apps_app_wxlua.vcproj 15 Jan 2008 00:08:17 -0000 1.9 *************** *** 1,343 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_wxlua" ProjectGUID="{502D5BFE-DB4D-575C-80A4-041EACC1829E}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> [...1872 lines suppressed...] ! /> ! <File ! RelativePath="..\..\wxlua\src\wxlua.h" ! /> ! </Filter> ! <Filter ! Name="Resource Files" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" ! > ! <File ! RelativePath="..\..\wxlua\src\wxlua.rc" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps_app_wxluaedit.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluaedit.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** apps_app_wxluaedit.vcproj 1 Aug 2007 03:21:22 -0000 1.8 --- apps_app_wxluaedit.vcproj 15 Jan 2008 00:08:17 -0000 1.9 *************** *** 1,341 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_wxluaedit" ProjectGUID="{69BE0B21-B245-596B-925D-7E663EA78802}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> [...1864 lines suppressed...] ! > ! <File ! RelativePath="..\..\wxluaedit\src\wxledit.h" ! /> ! </Filter> ! <Filter ! Name="Resource Files" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" ! > ! <File ! RelativePath="..\..\wxluaedit\src\wxluaedit.rc" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** apps_app_wxluafreeze.vcproj 1 Aug 2007 03:21:22 -0000 1.8 --- apps_app_wxluafreeze.vcproj 15 Jan 2008 00:08:17 -0000 1.9 *************** *** 1,337 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_wxluafreeze" ProjectGUID="{A0861CD6-3F98-50AE-9938-49423F911688}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> [...1848 lines suppressed...] ! > ! <File ! RelativePath="..\..\wxluafreeze\src\wxluafreeze.cpp" ! /> ! </Filter> ! <Filter ! Name="Resource Files" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" ! > ! <File ! RelativePath="..\..\wxluafreeze\src\wxluafreeze.rc" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps_app_lua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_lua.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_lua.vcproj 4 May 2007 20:22:24 -0000 1.4 --- apps_app_lua.vcproj 15 Jan 2008 00:08:17 -0000 1.5 *************** *** 1,334 **** ! <?xml version="1.0" ?> ! <!-- ! ! This makefile was generated by ! Bakefile 0.2.2 (http://www.bakefile.org) ! Do not modify, all changes will be overwritten! ! ! --> ! <VisualStudioProject Name="app_lua" ProjectGUID="{ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}" ProjectType="Visual C++" Version="8.00"> ! <Platforms> [...1836 lines suppressed...] ! </Configurations> ! <References> ! ! </References> ! <Files> ! <Filter ! Name="Source Files" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ! Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" ! > ! <File ! RelativePath="..\..\..\modules\lua\src\lua.c" ! /> ! </Filter> ! </Files> ! <Globals> ! ! </Globals> ! </VisualStudioProject> ! Index: apps.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps.sln,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps.sln 6 May 2007 10:52:47 -0000 1.4 --- apps.sln 15 Jan 2008 00:08:17 -0000 1.5 *************** *** 1,216 **** ! Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_lua", "apps_app_lua.vcproj", "{ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_luac", "apps_app_luac.vcproj", "{50EEE281-856E-5AD8-9E06-E0A15E37B4C5}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_wxlua", "apps_app_wxlua.vcproj", "{502D5BFE-DB4D-575C-80A4-041EACC1829E}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_wxluaedit", "apps_app_wxluaedit.vcproj", "{69BE0B21-B245-596B-925D-7E663EA78802}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_wxluacan", "apps_app_wxluacan.vcproj", "{30A66F03-5391-5C18-8EE8-E2996DB1512B}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_wxluafreeze", "apps_app_wxluafreeze.vcproj", "{A0861CD6-3F98-50AE-9938-49423F911688}" ! EndProject ! Global ! GlobalSection(SolutionConfigurationPlatforms) = preSolution ! Release Unicode DLL Monolithic|Win32 = Release Unicode DLL Monolithic|Win32 ! Release Unicode DLL Multilib|Win32 = Release Unicode DLL Multilib|Win32 ! Release Unicode Monolithic|Win32 = Release Unicode Monolithic|Win32 ! Release Unicode Multilib|Win32 = Release Unicode Multilib|Win32 ! Release DLL Monolithic|Win32 = Release DLL Monolithic|Win32 ! Release DLL Multilib|Win32 = Release DLL Multilib|Win32 ! Release Monolithic|Win32 = Release Monolithic|Win32 ! Release Multilib|Win32 = Release Multilib|Win32 ! Debug Unicode DLL Monolithic|Win32 = Debug Unicode DLL Monolithic|Win32 ! Debug Unicode DLL Multilib|Win32 = Debug Unicode DLL Multilib|Win32 ! Debug Unicode Monolithic|Win32 = Debug Unicode Monolithic|Win32 ! Debug Unicode Multilib|Win32 = Debug Unicode Multilib|Win32 ! Debug DLL Monolithic|Win32 = Debug DLL Monolithic|Win32 ! Debug DLL Multilib|Win32 = Debug DLL Multilib|Win32 ! Debug Monolithic|Win32 = Debug Monolithic|Win32 ! Debug Multilib|Win32 = Debug Multilib|Win32 ! EndGlobalSection ! GlobalSection(ProjectConfigurationPlatforms) = postSolution ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode Monolithic|Win32.Build.0 = Debug Unicode Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Unicode Multilib|Win32.Build.0 = Debug Unicode Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Monolithic|Win32.Build.0 = Debug Monolithic|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 ! {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Monolithic|Win32.Build.0 = Debug Unicode Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Multilib|Win32.Build.0 = Debug Unicode Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Monolithic|Win32.Build.0 = Debug Monolithic|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 ! {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 ! {502D5BFE-DB4D-575C-80A4-041EACC1829E}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {502D5BFE-DB4D... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:08:50
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13559 Modified Files: Makefile.in configure Log Message: regenerated all makefiles with bakefile 0.2.3 RC2 Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Makefile.in 9 Jan 2008 04:59:57 -0000 1.30 --- Makefile.in 15 Jan 2008 00:08:15 -0000 1.31 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 10,13 **** --- 10,14 ---- prefix = @prefix@ exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ INSTALL = @INSTALL@ top_srcdir = @top_srcdir@ *************** *** 44,55 **** rm -rf ./.deps ./.pch rm -f ./*.o ! (cd ./modules/ && $(MAKE) clean) ! (cd ./apps/ && $(MAKE) clean) rm -f build/autopackage/default.apspec distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! (cd ./modules/ && $(MAKE) distclean) ! (cd ./apps/ && $(MAKE) distclean) modules: --- 45,56 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! -(cd ./modules/ && $(MAKE) clean) ! -(cd ./apps/ && $(MAKE) clean) rm -f build/autopackage/default.apspec distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! -(cd ./modules/ && $(MAKE) distclean) ! -(cd ./apps/ && $(MAKE) distclean) modules: Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** configure 14 Jan 2008 23:30:20 -0000 1.73 --- configure 15 Jan 2008 00:08:15 -0000 1.74 *************** *** 691,694 **** --- 691,695 ---- WX_SHARED WX_PORT + RPATH_FLAGS LUA_DIR CXXCPP *************** *** 803,807 **** COND_UNICODE_1 COND_USE_APPS_1 [...3244 lines suppressed...] LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then break elif $ac_last_try; then *************** *** 11959,11963 **** if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is $lua_dir)" else echo " - Using BUILT-IN lua library" --- 14802,14806 ---- if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_dir')" else echo " - Using BUILT-IN lua library" |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:08:32
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13559/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: regenerated all makefiles with bakefile 0.2.3 RC2 Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.vc 10 Jan 2008 23:06:26 -0000 1.75 --- makefile.vc 15 Jan 2008 00:08:26 -0000 1.76 *************** *** 1,2315 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...4601 lines suppressed...] ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\wxluasocket\src\dummy.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxldserv.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxldtarg.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxlsock.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket_bind.cpp ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_CXXFLAGS) ..\..\luamodule\src\luamodule.cpp ! Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.bcc 10 Jan 2008 23:06:25 -0000 1.76 --- makefile.bcc 15 Jan 2008 00:08:24 -0000 1.77 *************** *** 1,2183 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! .autodepend ! ! !ifndef BCCDIR ! !ifndef MAKEDIR [...4337 lines suppressed...] ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H ..\..\wxluasocket\src\dummy.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxldserv.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxldtarg.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxlsock.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) ..\..\wxluasocket\src\wxluasocket_bind.cpp ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp ! $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) ..\..\luamodule\src\luamodule.cpp ! Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.wat 10 Jan 2008 23:06:26 -0000 1.75 --- makefile.wat 15 Jan 2008 00:08:26 -0000 1.76 *************** *** 1,2452 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...4875 lines suppressed...] ! $(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_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.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_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_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)\mod_luamodule_luamodule.obj : .AUTODEPEND ..\..\luamodule\src\luamodule.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_CXXFLAGS) $< ! Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.gcc 10 Jan 2008 23:06:25 -0000 1.75 --- makefile.gcc 15 Jan 2008 00:08:25 -0000 1.76 *************** *** 1,2173 **** ! # ========================================================================= ! # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) ! # Do not modify, all changes will be overwritten! ! # ========================================================================= ! ! ! ! # ------------------------------------------------------------------------- ! # These are configurable options: [...4325 lines suppressed...] ! ! 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_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_DLL_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)\mod_luamodule_luamodule.o: ../../luamodule/src/luamodule.cpp ! $(CXX) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(CPPDEPS) $< ! ! .PHONY: all clean ! ! ! SHELL := $(COMSPEC) ! ! # Dependencies tracking: ! -include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:05:11
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12306 Modified Files: aclocal.m4 autoconf_inc.m4 bakefile-lang.m4 bakefile.m4 Log Message: updated to bakefile 0.2.3 Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** autoconf_inc.m4 16 Jul 2007 19:34:28 -0000 1.27 --- autoconf_inc.m4 15 Jan 2008 00:04:58 -0000 1.28 *************** *** 1,13 **** ! dnl ### begin block 00_header[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### dnl dnl This macro was generated by ! dnl Bakefile 0.2.2 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../modules/build/bakefiles/modules.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then --- 1,13 ---- ! dnl ### begin block 00_header[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### dnl dnl This macro was generated by ! dnl Bakefile 0.2.3 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../modules/build/bakefiles/modules.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS ! dnl ### begin block 20_COND_BUILD_DEBUG[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 15,19 **** fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then --- 15,19 ---- fi AC_SUBST(COND_BUILD_DEBUG) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_0="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then *************** *** 21,25 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then --- 21,25 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_0) ! dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_DEBUG_UNICODE_1="#" if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then *************** *** 27,31 **** fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then --- 27,31 ---- fi AC_SUBST(COND_BUILD_DEBUG_UNICODE_1) ! dnl ### begin block 20_COND_BUILD_RELEASE[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then *************** *** 33,37 **** fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then --- 33,37 ---- fi AC_SUBST(COND_BUILD_RELEASE) ! dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_BUILD_RELEASE_UNICODE_1="#" if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then *************** *** 39,43 **** fi AC_SUBST(COND_BUILD_RELEASE_UNICODE_1) ! dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then --- 39,43 ---- fi AC_SUBST(COND_BUILD_RELEASE_UNICODE_1) ! dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then *************** *** 45,49 **** fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then --- 45,49 ---- fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then *************** *** 93,97 **** fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then --- 93,103 ---- fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_0[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_MAC_0="#" ! if test "x$PLATFORM_MAC" = "x0" ; then ! COND_PLATFORM_MAC_0="" ! fi ! AC_SUBST(COND_PLATFORM_MAC_0) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 195,199 **** fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then --- 201,205 ---- fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then *************** *** 285,289 **** fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then --- 291,295 ---- fi AC_SUBST(COND_SHARED_1_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_UNICODE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_UNICODE_0="#" if test "x$UNICODE" = "x0" ; then *************** *** 291,295 **** fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then --- 297,301 ---- fi AC_SUBST(COND_UNICODE_0) ! dnl ### begin block 20_COND_UNICODE_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then *************** *** 303,312 **** fi AC_SUBST(COND_USE_APPS_1) - dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### - COND_USE_BIN2C_1="#" - if test "x$USE_BIN2C" = "x1" ; then - COND_USE_BIN2C_1="" - fi - AC_SUBST(COND_USE_BIN2C_1) dnl ### begin block 20_COND_USE_PCH_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_PCH_1="#" --- 309,312 ---- *************** *** 375,412 **** fi AC_SUBST(COND_WINDOWS_IMPLIB_1) - dnl ### begin block 20_COND_WX_PORT_GTK[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_GTK="#" - if test "x$WX_PORT" = "xgtk" ; then - COND_WX_PORT_GTK="" - fi - AC_SUBST(COND_WX_PORT_GTK) - dnl ### begin block 20_COND_WX_PORT_MAC[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MAC="#" - if test "x$WX_PORT" = "xmac" ; then - COND_WX_PORT_MAC="" - fi - AC_SUBST(COND_WX_PORT_MAC) - dnl ### begin block 20_COND_WX_PORT_MGL[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MGL="#" - if test "x$WX_PORT" = "xmgl" ; then - COND_WX_PORT_MGL="" - fi - AC_SUBST(COND_WX_PORT_MGL) - dnl ### begin block 20_COND_WX_PORT_MOTIF[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MOTIF="#" - if test "x$WX_PORT" = "xmotif" ; then - COND_WX_PORT_MOTIF="" - fi - AC_SUBST(COND_WX_PORT_MOTIF) - dnl ### begin block 20_COND_WX_PORT_MSW[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_MSW="#" - if test "x$WX_PORT" = "xmsw" ; then - COND_WX_PORT_MSW="" - fi - AC_SUBST(COND_WX_PORT_MSW) - dnl ### begin block 20_COND_WX_PORT_X11[../../util/build/bakefiles/util.bkl] ### - COND_WX_PORT_X11="#" - if test "x$WX_PORT" = "xx11" ; then - COND_WX_PORT_X11="" - fi - AC_SUBST(COND_WX_PORT_X11) --- 375,376 ---- Index: bakefile.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/bakefile.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bakefile.m4 10 Jan 2008 00:25:16 -0000 1.1 --- bakefile.m4 15 Jan 2008 00:04:59 -0000 1.2 *************** *** 309,333 **** *-*-linux* ) ! if test "x$GCC" != "xyes"; then ! AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc, ! [ ! AC_TRY_COMPILE([], ! [ ! #ifndef __INTEL_COMPILER ! This is not ICC ! #endif ! ], ! bakefile_cv_prog_icc=yes, ! bakefile_cv_prog_icc=no ! ) ! ]) ! if test "$bakefile_cv_prog_icc" = "yes"; then ! PIC_FLAG="-KPIC" ! fi fi ;; *-*-solaris2* ) ! if test "x$GCC" != xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" --- 309,323 ---- *-*-linux* ) ! if test "$INTELCC" = "yes"; then ! PIC_FLAG="-KPIC" ! elif test "x$SUNCXX" = "xyes"; then ! SHARED_LD_CC="${CC} -G -o" ! SHARED_LD_CXX="${CXX} -G -o" ! PIC_FLAG="-KPIC" fi ;; *-*-solaris2* ) ! if test "x$SUNCXX" = xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" *************** *** 499,504 **** case "${BAKEFILE_HOST}" in ! *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) ! SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 USE_SOVERLINUX=1 --- 489,499 ---- case "${BAKEFILE_HOST}" in ! *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ ! *-*-k*bsd*-gnu | *-*-mirbsd* ) ! if test "x$SUNCXX" = "xyes"; then ! SONAME_FLAG="-h " ! else ! SONAME_FLAG="-Wl,-soname," ! fi USE_SOVERSION=1 USE_SOVERLINUX=1 *************** *** 645,660 **** AC_CHECK_TOOL(NM, nm, :) ! case ${BAKEFILE_HOST} in ! *-hp-hpux* ) ! dnl HP-UX install doesn't handle the "-d" switch so don't ! dnl use it there ! INSTALL_DIR="mkdir -p" ! ;; ! * ) ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ! ;; ! esac AC_SUBST(INSTALL_DIR) --- 640,658 ---- AC_CHECK_TOOL(NM, nm, :) ! dnl This check is necessary because "install -d" doesn't exist on ! dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80 ! AC_MSG_CHECKING([for command to install directories]) ! INSTALL_TEST_DIR=acbftest$$ ! $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 ! if test $? = 0 -a -d $INSTALL_TEST_DIR; then ! rmdir $INSTALL_TEST_DIR ! dnl we must refer to makefile's $(INSTALL) variable and not ! dnl current value of shell variable, hence the single quoting: ! INSTALL_DIR='$(INSTALL) -d' ! AC_MSG_RESULT([$INSTALL -d]) ! else ! INSTALL_DIR="mkdir -p" ! AC_MSG_RESULT([mkdir -p]) ! fi AC_SUBST(INSTALL_DIR) *************** *** 804,807 **** --- 802,811 ---- AC_PREREQ([2.58]) + dnl We need to always run C/C++ compiler tests, but it's also possible + dnl for the user to call these macros manually, hence this instead of + dnl simply calling these macros. See http://www.bakefile.org/ticket/64 + AC_REQUIRE([AC_BAKEFILE_PROG_CC]) + AC_REQUIRE([AC_BAKEFILE_PROG_CXX]) + if test "x$BAKEFILE_HOST" = "x"; then if test "x${host}" = "x" ; then *************** *** 824,828 **** AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" dnl includes autoconf_inc.m4: --- 828,832 ---- AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.3" dnl includes autoconf_inc.m4: *************** *** 866,873 **** ${D}* ${D}{DEPSFLAG} status=${D}? ! if test ${D}{status} != 0 ; then ! exit ${D}{status} ! fi ! # move created file to the location we want it in: while test ${D}# -gt 0; do case "${D}1" in --- 870,875 ---- ${D}* ${D}{DEPSFLAG} status=${D}? ! ! # determine location of created files: while test ${D}# -gt 0; do case "${D}1" in *************** *** 886,889 **** --- 888,899 ---- depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` + + # if the compiler failed, we're done: + if test ${D}{status} != 0 ; then + rm -f ${D}depfile + exit ${D}{status} + fi + + # move created file to the location we want it in: if test -f ${D}depfile ; then sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** aclocal.m4 14 Jan 2008 17:11:10 -0000 1.54 --- aclocal.m4 15 Jan 2008 00:04:58 -0000 1.55 *************** *** 1,6 **** ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 13,16 **** --- 13,17 ---- m4_include([bakefile-dllar.m4]) + m4_include([bakefile-lang.m4]) m4_include([bakefile.m4]) m4_include([wxwin.m4]) Index: bakefile-lang.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/bakefile-lang.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bakefile-lang.m4 10 Jan 2008 00:25:16 -0000 1.1 --- bakefile-lang.m4 15 Jan 2008 00:04:58 -0000 1.2 *************** *** 24,98 **** dnl $Id$ dnl ! dnl Compiler detection macros by David Elliott dnl dnl =========================================================================== ! dnl Macros to detect non-GNU compilers (MetroWerks, XLC) dnl =========================================================================== dnl Based on autoconf _AC_LANG_COMPILER_GNU - AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS], - [AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler], - [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks], - [AC_TRY_COMPILE([],[#ifndef __MWERKS__ - choke me - #endif - ], - [bakefile_compiler_mwerks=yes], - [bakefile_compiler_mwerks=no]) - bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks - ]) - ]) - - dnl Loosely based on autoconf AC_PROG_CC - dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead. - AC_DEFUN([AC_BAKEFILE_PROG_MWCC], - [AC_LANG_PUSH(C) - _AC_BAKEFILE_LANG_COMPILER_MWERKS - MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` - AC_LANG_POP(C) - ]) - - dnl Loosely based on autoconf AC_PROG_CXX - dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead. - AC_DEFUN([AC_BAKEFILE_PROG_MWCXX], - [AC_LANG_PUSH(C++) - _AC_BAKEFILE_LANG_COMPILER_MWERKS - MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes` - AC_LANG_POP(C++) - ]) - - dnl Based on autoconf _AC_LANG_COMPILER_GNU - AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC], - [AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler], - [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc], - [AC_TRY_COMPILE([],[#ifndef __xlC__ - choke me - #endif - ], - [bakefile_compiler_xlc=yes], - [bakefile_compiler_xlc=no]) - bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc - ]) - ]) - - dnl Loosely based on autoconf AC_PROG_CC - AC_DEFUN([AC_BAKEFILE_PROG_XLCC], - [AC_LANG_PUSH(C) - _AC_BAKEFILE_LANG_COMPILER_XLC - XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` - AC_LANG_POP(C) - ]) - - dnl Loosely based on autoconf AC_PROG_CXX - AC_DEFUN([AC_BAKEFILE_PROG_XLCXX], - [AC_LANG_PUSH(C++) - _AC_BAKEFILE_LANG_COMPILER_XLC - XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` - AC_LANG_POP(C++) - ]) - - dnl Based on autoconf _AC_LANG_COMPILER_GNU dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO) AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER], --- 24,36 ---- dnl $Id$ dnl ! dnl Compiler detection macros by David Elliott and Vadim Zeitlin dnl dnl =========================================================================== ! dnl Macros to detect different C/C++ compilers dnl =========================================================================== dnl Based on autoconf _AC_LANG_COMPILER_GNU dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO) AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER], *************** *** 114,118 **** ] ) - AC_LANG_POP($2) if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then :; $4 --- 52,55 ---- *************** *** 120,123 **** --- 57,83 ---- :; $5 fi + AC_LANG_POP($2) + ]) + + dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++ + AC_DEFUN([AC_BAKEFILE_PROG_MWCC], + [ + _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes) + ]) + + AC_DEFUN([AC_BAKEFILE_PROG_MWCXX], + [ + _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes) + ]) + + dnl IBM xlC compiler defines __xlC__ for both C and C++ + AC_DEFUN([AC_BAKEFILE_PROG_XLCC], + [ + _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes) + ]) + + AC_DEFUN([AC_BAKEFILE_PROG_XLCXX], + [ + _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes) ]) *************** *** 229,233 **** --- 189,198 ---- [ AC_PROG_$1 + + dnl Intel compiler can be used under several different OS and even + dnl different architectures (x86, amd64 and Itanium) so it's easier to just + dnl always test for it AC_BAKEFILE_PROG_INTEL$1 + dnl if we're using gcc, we can't be using any of incompatible compilers if test "x$G$1" != "xyes"; then *************** *** 256,259 **** --- 221,229 ---- ;; + Linux*) + dnl Sun CC is now available under Linux too + AC_BAKEFILE_PROG_SUN$1 + ;; + HP-UX*) AC_BAKEFILE_PROG_HP$1 |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:03:08
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11251/modules/build/bakefiles Modified Files: modules.bkl Log Message: hack to be able to use bake 0.2.3 and still get correct installation rule Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** modules.bkl 10 Jan 2008 17:04:25 -0000 1.49 --- modules.bkl 15 Jan 2008 00:03:02 -0000 1.50 *************** *** 45,48 **** --- 45,57 ---- <!-- ================================================================== --> + <!-- HACK: instead of using the install-headers-to feature we currently + need to use this <data-files> target because of this bakefile + bug: http://www.bakefile.org/ticket/138 --> + <data-files> + <srcdir>$(SRCDIR)</srcdir> + <files>$(LUA_HDR)</files> + <install-to>$(INCLUDEDIR)</install-to> + </data-files> + <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the *************** *** 70,79 **** <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <!-- see options.bkl for these --> --- 79,89 ---- <sources>$(LUA_SRC)</sources> ! <headers>$(LUA_HDR)</headers> <install-to>$(LIBDIR)</install-to> ! ! <!-- see comment on the <data-files> above... ! ! <install-headers-to>$(PREFIX)</install-headers-to> --> <!-- see options.bkl for these --> *************** *** 94,103 **** <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <if cond="TARGETING_WIN32=='1'"> --- 104,114 ---- <sources>$(LUA_SRC)</sources> ! <headers>$(LUA_HDR)</headers> <install-to>$(LIBDIR)</install-to> ! ! <!-- see comment on the <data-files> above... ! ! <install-headers-to>$(PREFIX)</install-headers-to> --> <if cond="TARGETING_WIN32=='1'"> |
|
From: Francesco M. <fr...@us...> - 2008-01-15 00:00:33
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10374/build/autoconf Modified Files: configure.ac Log Message: do also AC_SUBST on RPATH_FLAGS Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** configure.ac 14 Jan 2008 23:30:20 -0000 1.62 --- configure.ac 15 Jan 2008 00:00:21 -0000 1.63 *************** *** 196,203 **** # NOTE: -rpath is not supported by Mac's ld linker! if test "SHARED" = "1" -a "PLATFORM_UNIX" = "1"; then RPATH_FLAGS="-Wl,-rpath,../lib" fi ! # check for Lua --- 196,204 ---- # NOTE: -rpath is not supported by Mac's ld linker! + RPATH_FLAGS="" if test "SHARED" = "1" -a "PLATFORM_UNIX" = "1"; then RPATH_FLAGS="-Wl,-rpath,../lib" fi ! AC_SUBST(RPATH_FLAGS) # check for Lua *************** *** 749,753 **** if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is $lua_dir)" else echo " - Using BUILT-IN lua library" --- 750,754 ---- if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_dir')" else echo " - Using BUILT-IN lua library" |
|
From: Francesco M. <fr...@us...> - 2008-01-14 23:30:25
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427/apps Modified Files: Makefile.in Log Message: add to the linker the -rpath flag only under Unix Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** Makefile.in 10 Jan 2008 17:04:24 -0000 1.66 --- Makefile.in 14 Jan 2008 23:30:21 -0000 1.67 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.2 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 10,13 **** --- 10,14 ---- prefix = @prefix@ exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ *************** *** 40,43 **** --- 41,45 ---- LUA_DIR = @LUA_DIR@ WXLUA_LIBS = @WXLUA_LIBS@ + RPATH_FLAGS = @RPATH_FLAGS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 94,100 **** --- 96,104 ---- @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u + @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) @COND_SHARED_0@__app_luac___depname = ../bin/luac$(EXEEXT) + @COND_PLATFORM_MAC_0@__app_luac___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) *************** *** 104,107 **** --- 108,112 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ../bin/wxlua$(EXEEXT) + @COND_PLATFORM_MAC_0@__app_wxlua___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxlua$(EXEEXT) *************** *** 125,128 **** --- 130,134 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = ../bin/wxluaedit$(EXEEXT) + @COND_PLATFORM_MAC_0@__app_wxluaedit___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT) *************** *** 145,148 **** --- 151,155 ---- @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = ../bin/wxluacan$(EXEEXT) + @COND_PLATFORM_MAC_0@__app_wxluacan___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxluacan$(EXEEXT) *************** *** 166,169 **** --- 173,177 ---- @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = ../bin/wxluafreeze$(EXEEXT) + @COND_PLATFORM_MAC_0@__app_wxluafreeze___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT) *************** *** 186,190 **** @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle - @COND_SHARED_1@__app = -Wl,-rpath,../lib ### Targets: ### --- 194,197 ---- *************** *** 222,226 **** ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WXLUA_LIBS) -lm $(__app_lua___mac_setfilecmd) --- 229,233 ---- ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) *************** *** 234,238 **** @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WXLUA_LIBS) -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) --- 241,245 ---- @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) *************** *** 246,250 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 253,257 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 281,285 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 288,292 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 316,320 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 323,327 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 351,355 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 358,362 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) |
|
From: Francesco M. <fr...@us...> - 2008-01-14 23:30:24
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427/build/autoconf Modified Files: configure.ac Log Message: add to the linker the -rpath flag only under Unix Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** configure.ac 14 Jan 2008 22:28:18 -0000 1.61 --- configure.ac 14 Jan 2008 23:30:20 -0000 1.62 *************** *** 195,198 **** --- 195,204 ---- + # NOTE: -rpath is not supported by Mac's ld linker! + if test "SHARED" = "1" -a "PLATFORM_UNIX" = "1"; then + RPATH_FLAGS="-Wl,-rpath,../lib" + fi + + # check for Lua # |
|
From: Francesco M. <fr...@us...> - 2008-01-14 23:30:24
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427 Modified Files: configure Log Message: add to the linker the -rpath flag only under Unix Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** configure 14 Jan 2008 22:28:18 -0000 1.72 --- configure 14 Jan 2008 23:30:20 -0000 1.73 *************** *** 767,770 **** --- 767,771 ---- COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 + COND_PLATFORM_MAC_0 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 *************** *** 4801,4804 **** --- 4802,4811 ---- + # NOTE: -rpath is not supported by Mac's ld linker! + if test "SHARED" = "1" -a "PLATFORM_UNIX" = "1"; then + RPATH_FLAGS="-Wl,-rpath,../lib" + fi + + # check for Lua # *************** *** 10008,10012 **** ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" --- 10015,10019 ---- ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" *************** *** 10294,10297 **** --- 10301,10309 ---- fi + COND_PLATFORM_MAC_0="#" + if test "x$PLATFORM_MAC" = "x0" ; then + COND_PLATFORM_MAC_0="" + fi + COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 11428,11431 **** --- 11440,11444 ---- COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim + COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim *************** *** 11469,11473 **** COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim - COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim _ACEOF --- 11482,11485 ---- *************** *** 11511,11514 **** --- 11523,11527 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim *************** *** 11526,11530 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then --- 11539,11543 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then |
|
From: Francesco M. <fr...@us...> - 2008-01-14 23:30:24
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427/build/bakefiles Modified Files: wxluabase.bkl Log Message: add to the linker the -rpath flag only under Unix Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wxluabase.bkl 14 Jan 2008 23:00:24 -0000 1.44 --- wxluabase.bkl 14 Jan 2008 23:30:20 -0000 1.45 *************** *** 286,297 **** also before installing the component system-wide: --> <define-tag name="rpath-to" rules="exe,module"> ! <set var="RPATH"> ! <if cond="FORMAT=='gnu' and SHARED=='1'">-Wl,-rpath,$(value)/gcc_dll</if> ! <if cond="FORMAT=='autoconf' and SHARED=='1'">-Wl,-rpath,$(value)</if> ! </set> ! <!-- for autoconf&gnu only (see comments above): --> ! <ldflags>$(RPATH)</ldflags> </define-tag> --- 286,307 ---- also before installing the component system-wide: --> + + <if cond="FORMAT=='autoconf'"> + <option name="RPATH_FLAGS"/> + </if> + <define-tag name="rpath-to" rules="exe,module"> ! <!-- for autoconf&gnu only (see comments above): --> ! ! <if cond="FORMAT=='gnu'"> ! <set var="RPATH_FLAGS"> ! <if cond="SHARED=='1'">-Wl,-rpath,$(value)/gcc_dll</if> ! </set> ! <ldflags>$(RPATH_FLAGS)</ldflags> ! </if> ! <if cond="FORMAT=='autoconf'"> ! <ldflags>$(RPATH_FLAGS)</ldflags> ! </if> </define-tag> |
|
From: Francesco M. <fr...@us...> - 2008-01-14 23:00:27
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18906/build/bakefiles Modified Files: wxluabase.bkl Log Message: fix some typos; minimal bakefile version is now 0.2.3 Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxluabase.bkl 10 Jan 2008 17:04:25 -0000 1.43 --- wxluabase.bkl 14 Jan 2008 23:00:24 -0000 1.44 *************** *** 13,17 **** <makefile> ! <requires version="0.2.2"/> <using module="datafiles"/> --- 13,17 ---- <makefile> ! <requires version="0.2.3"/> <using module="datafiles"/> *************** *** 120,137 **** <define-tag name="wxlua-lib" rules="exe,dll,module"> <if cond="value not in WXLUA_LIB_LIST.split()"> ! <error>Unknown wxLua library given in the wxlib-lib tag</error> </if> <if cond="value=='lua'"> <!-- all wxlua-dependent libraries should have been already listed ! thus we can now add WX_LIBS to the linker line --> <ldlibs>$(WXLUA_LIBS)</ldlibs> </if> </define-tag> - </if> <if cond="FORMAT not in ['autoconf']"> - <define-tag name="wxlua-lib" rules="exe,dll,module"> <if cond="value not in WXLUA_LIB_LIST.split()"> --- 120,135 ---- <define-tag name="wxlua-lib" rules="exe,dll,module"> <if cond="value not in WXLUA_LIB_LIST.split()"> ! <error>Unknown wxLua library given in the wxlua-lib tag</error> </if> <if cond="value=='lua'"> <!-- all wxlua-dependent libraries should have been already listed ! thus we can now add WXLUA_LIBS to the linker line --> <ldlibs>$(WXLUA_LIBS)</ldlibs> </if> </define-tag> </if> <if cond="FORMAT not in ['autoconf']"> <define-tag name="wxlua-lib" rules="exe,dll,module"> <if cond="value not in WXLUA_LIB_LIST.split()"> |
|
From: Francesco M. <fr...@us...> - 2008-01-14 22:59:29
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18471/build/bakefiles Modified Files: Bakefiles.bkgen Log Message: add XMLNS for bakefile 0.2.3 Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Bakefiles.bkgen 26 Jul 2007 22:36:17 -0000 1.13 --- Bakefiles.bkgen 14 Jan 2008 22:59:23 -0000 1.14 *************** *** 2,6 **** <!-- $Id$ --> ! <bakefile-gen> --- 2,6 ---- <!-- $Id$ --> ! <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen"> |
|
From: Francesco M. <fr...@us...> - 2008-01-14 22:58:52
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18081/apps/build/bakefiles Modified Files: apps.bkl Log Message: don't use <wxlua-lib> tag for lua and luac as it would put all wxLua libraries on the linker line Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** apps.bkl 6 May 2007 10:52:45 -0000 1.57 --- apps.bkl 14 Jan 2008 22:58:47 -0000 1.58 *************** *** 72,77 **** <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! <!-- lua apps needs only pure lua library: --> ! <wxlua-lib>lua</wxlua-lib> <if cond="TARGETING_WIN32=='0'"> --- 72,81 ---- <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! <!-- lua apps needs only pure lua library; using ! <wxlua-lib>lua</wxlua-lib> ! we would add WXLUA_LIBS ldflags for autoconf format, while ! we don't want it, so we'll rather use just: ! --> ! <sys-lib>lua5.1</sys-lib> <if cond="TARGETING_WIN32=='0'"> |
|
From: Francesco M. <fr...@us...> - 2008-01-14 22:28:24
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6204/build/autoconf Modified Files: configure.ac Log Message: fix the wxlua.pc creation Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** configure.ac 14 Jan 2008 21:35:09 -0000 1.60 --- configure.ac 14 Jan 2008 22:28:18 -0000 1.61 *************** *** 76,82 **** AC_BINDLIB_ENABLE([xrc], [wxXRC]) - # remove initial comma: - #wxbind_list_enabled=${wxbind_list_enabled:1} - AC_ARG_ENABLE([wxluadebug], [AC_HELP_STRING([--enable-wxluadebug], [Compiles the wxLua debug support (default is yes)])], --- 76,79 ---- *************** *** 641,645 **** dnl the set of the wxLua library names prefixed with -l ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" ]) --- 638,642 ---- dnl the set of the wxLua library names prefixed with -l ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" ]) *************** *** 664,667 **** --- 661,669 ---- WXLUA_LDFLAGS="$WXLUA_LDFLAGS -llua5.1" + # remove initial space: + WXLUA_MODNAMES=${WXLUA_MODNAMES:1} + WXLUA_LIBNAMES=${WXLUA_LIBNAMES:1} + WXLUA_LDFLAGS=${WXLUA_LDFLAGS:1} + AC_SUBST([WXLUA_MODNAMES]) AC_SUBST([WXLUA_LIBNAMES]) |
|
From: Francesco M. <fr...@us...> - 2008-01-14 22:28:22
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6204 Modified Files: configure Log Message: fix the wxlua.pc creation Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** configure 14 Jan 2008 21:35:09 -0000 1.71 --- configure 14 Jan 2008 22:28:18 -0000 1.72 *************** *** 2417,2423 **** - # remove initial comma: - #wxbind_list_enabled=${wxbind_list_enabled:1} - # Check whether --enable-wxluadebug was given. if test "${enable_wxluadebug+set}" = set; then --- 2417,2420 ---- *************** *** 7645,7649 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7642,7646 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7666,7670 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7663,7667 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7687,7691 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7684,7688 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7708,7712 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7705,7709 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7729,7733 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7726,7730 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7750,7754 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7747,7751 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7771,7775 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7768,7772 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7792,7796 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7789,7793 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7813,7817 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7810,7814 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7834,7838 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7831,7835 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7855,7859 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7852,7856 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7876,7880 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7873,7877 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7898,7902 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7895,7899 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7919,7923 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7916,7920 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7940,7944 **** WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" --- 7937,7941 ---- WXLUA_LIBNAMES="$WXLUA_LIBNAMES $_TMP" ! WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$_TMP" *************** *** 7946,7949 **** --- 7943,7951 ---- WXLUA_LDFLAGS="$WXLUA_LDFLAGS -llua5.1" + # remove initial space: + WXLUA_MODNAMES=${WXLUA_MODNAMES:1} + WXLUA_LIBNAMES=${WXLUA_LIBNAMES:1} + WXLUA_LDFLAGS=${WXLUA_LDFLAGS:1} + |
|
From: John L. <jr...@us...> - 2008-01-14 21:35:22
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16813/wxLua/build/autoconf Modified Files: configure.ac Log Message: Fix wxStEdit check to link to stc lib Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** configure.ac 14 Jan 2008 18:56:16 -0000 1.59 --- configure.ac 14 Jan 2008 21:35:09 -0000 1.60 *************** *** 565,569 **** # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs html,adv,core,base` WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit]) --- 565,569 ---- # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,html,adv,core,base` WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit]) |
|
From: John L. <jr...@us...> - 2008-01-14 21:35:14
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16813/wxLua Modified Files: configure Log Message: Fix wxStEdit check to link to stc lib Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** configure 14 Jan 2008 18:56:16 -0000 1.70 --- configure 14 Jan 2008 21:35:09 -0000 1.71 *************** *** 7169,7173 **** # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs html,adv,core,base` --- 7169,7173 ---- # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs stc,html,adv,core,base` |
|
From: John L. <jr...@us...> - 2008-01-14 18:56:21
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19934/wxLua/build/autoconf Modified Files: configure.ac wxwin.m4 Log Message: Fix for $DEBUG="" == $DEBUG="0" in wxwin.m4 Less awkward echo statement in configure.ac Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** configure.ac 14 Jan 2008 18:10:31 -0000 1.58 --- configure.ac 14 Jan 2008 18:56:16 -0000 1.59 *************** *** 551,559 **** if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo Path to wxStEdit from --with-wxstedit-dir: \'$WXSTEDIT\' else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo Path to wxStEdit from \$WXSTEDIT environment variable: \'$WXSTEDIT\' fi --- 551,559 ---- if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'" else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'" fi *************** *** 564,567 **** --- 564,570 ---- fi + # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. + WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs html,adv,core,base` + WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit]) AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h], *************** *** 578,582 **** For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check is failed look in config.log. --- 581,585 ---- For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check has failed look in config.log. *************** *** 781,785 **** echo ! echo " - compact list of the wxWidgets library for which" echo " binding modules will be created: " echo " $WXLIB_NAMES" --- 784,788 ---- echo ! echo " - compact list of the wxWidgets libraries for which" echo " binding modules will be created: " echo " $WXLIB_NAMES" Index: wxwin.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxwin.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxwin.m4 14 Jan 2008 13:20:55 -0000 1.4 --- wxwin.m4 14 Jan 2008 18:56:16 -0000 1.5 *************** *** 409,413 **** dnl AC_MSG_ERROR([ dnl The wxrc program was not installed or not found. ! dnl dnl Please check the wxWidgets installation. dnl ]) --- 409,413 ---- dnl AC_MSG_ERROR([ dnl The wxrc program was not installed or not found. ! dnl dnl Please check the wxWidgets installation. dnl ]) *************** *** 438,448 **** [ AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler]) ! if test "x$WX_CONFIG_NAME" = x; then AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.]) else ! AC_MSG_CHECKING([for wxrc]) ! if test "x$WXRC" = x ; then dnl wx-config --utility is a new addition to wxWidgets: --- 438,448 ---- [ AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler]) ! if test "x$WX_CONFIG_NAME" = x; then AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.]) else ! AC_MSG_CHECKING([for wxrc]) ! if test "x$WXRC" = x ; then dnl wx-config --utility is a new addition to wxWidgets: *************** *** 460,464 **** ifelse([$1], , :, [$1]) fi ! AC_SUBST(WXRC) fi --- 460,464 ---- ifelse([$1], , :, [$1]) fi ! AC_SUBST(WXRC) fi *************** *** 468,476 **** dnl WX_LIKE_LIBNAME([output-var] [prefix], [name]) dnl ! dnl Sets the "output-var" variable to the name of a library named with same dnl wxWidgets rule. ! dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets dnl the $lib variable to: ! dnl 'mine_gtk2ud_test-2.8' dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28 dnl --------------------------------------------------------------------------- --- 468,476 ---- dnl WX_LIKE_LIBNAME([output-var] [prefix], [name]) dnl ! dnl Sets the "output-var" variable to the name of a library named with same dnl wxWidgets rule. ! dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets dnl the $lib variable to: ! dnl 'mine_gtk2ud_test-2.8' dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28 dnl --------------------------------------------------------------------------- *************** *** 750,754 **** dnl --------------------------------------------------------------------------- ! dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG] dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl --- 750,754 ---- dnl --------------------------------------------------------------------------- ! dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG] dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl *************** *** 765,771 **** AC_MSG_CHECKING([$3]) ! dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2 dnl string or to 0 otherwise. ! dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it dnl doesn't work; we use 'expr STRING : REGEXP' instead WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*") --- 765,771 ---- AC_MSG_CHECKING([$3]) ! dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2 dnl string or to 0 otherwise. ! dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it dnl doesn't work; we use 'expr STRING : REGEXP' instead WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*") *************** *** 952,956 **** if test "$DEBUG" = "1"; then BUILD="debug" ! elif test "$DEBUG" = ""; then BUILD="release" fi --- 952,956 ---- if test "$DEBUG" = "1"; then BUILD="debug" ! elif test "$DEBUG" = "" -o "$DEBUG" = "0"; then BUILD="release" fi *************** *** 1013,1017 **** dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END dnl ! dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info dnl about the configuration of the package which used the wxpresets. dnl --- 1013,1017 ---- dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END dnl ! dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info dnl about the configuration of the package which used the wxpresets. dnl |
|
From: John L. <jr...@us...> - 2008-01-14 18:56:21
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19934/wxLua Modified Files: configure Log Message: Fix for $DEBUG="" == $DEBUG="0" in wxwin.m4 Less awkward echo statement in configure.ac Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** configure 14 Jan 2008 18:10:30 -0000 1.69 --- configure 14 Jan 2008 18:56:16 -0000 1.70 *************** *** 4790,4794 **** if test "$DEBUG" = "1"; then BUILD="debug" ! elif test "$DEBUG" = ""; then BUILD="release" fi --- 4790,4794 ---- if test "$DEBUG" = "1"; then BUILD="debug" ! elif test "$DEBUG" = "" -o "$DEBUG" = "0"; then BUILD="release" fi *************** *** 7155,7163 **** if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo Path to wxStEdit from --with-wxstedit-dir: \'$WXSTEDIT\' else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo Path to wxStEdit from \$WXSTEDIT environment variable: \'$WXSTEDIT\' fi --- 7155,7163 ---- if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'" else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'" fi *************** *** 7168,7171 **** --- 7168,7174 ---- fi + # Temporarily rewrite WX_LIBS to include all the libs that wxStEdit requires. + WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs html,adv,core,base` + wx_temp="wxcode""_""$WX_PORT" *************** *** 7297,7301 **** For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check is failed look in config.log. --- 7300,7304 ---- For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check has failed look in config.log. *************** *** 7307,7311 **** For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check is failed look in config.log. --- 7310,7314 ---- For more information about wxStEdit look at http://wxcode.sourceforge.net/components/wxstedit ! For more information about why exactly this check has failed look in config.log. *************** *** 12056,12060 **** echo ! echo " - compact list of the wxWidgets library for which" echo " binding modules will be created: " echo " $WXLIB_NAMES" --- 12059,12063 ---- echo ! echo " - compact list of the wxWidgets libraries for which" echo " binding modules will be created: " echo " $WXLIB_NAMES" |
|
From: John L. <jr...@us...> - 2008-01-14 18:10:37
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2082/wxLua Modified Files: configure Log Message: Fix --enable-wxbindxxx=no to work now. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** configure 14 Jan 2008 17:11:10 -0000 1.68 --- configure 14 Jan 2008 18:10:30 -0000 1.69 *************** *** 2309,2315 **** ! # Check whether --enable-adv was given. ! if test "${enable_adv+set}" = set; then ! enableval=$enable_adv; else enable_wxbindadv=auto --- 2309,2315 ---- ! # Check whether --enable-wxbindadv was given. ! if test "${enable_wxbindadv+set}" = set; then ! enableval=$enable_wxbindadv; else enable_wxbindadv=auto *************** *** 2318,2324 **** ! # Check whether --enable-aui was given. ! if test "${enable_aui+set}" = set; then ! enableval=$enable_aui; else enable_wxbindaui=auto --- 2318,2324 ---- ! # Check whether --enable-wxbindaui was given. ! if test "${enable_wxbindaui+set}" = set; then ! enableval=$enable_wxbindaui; else enable_wxbindaui=auto *************** *** 2327,2333 **** ! # Check whether --enable-base was given. ! if test "${enable_base+set}" = set; then ! enableval=$enable_base; else enable_wxbindbase=auto --- 2327,2333 ---- ! # Check whether --enable-wxbindbase was given. ! if test "${enable_wxbindbase+set}" = set; then ! enableval=$enable_wxbindbase; else enable_wxbindbase=auto *************** *** 2336,2342 **** ! # Check whether --enable-core was given. ! if test "${enable_core+set}" = set; then ! enableval=$enable_core; else enable_wxbindcore=auto --- 2336,2342 ---- ! # Check whether --enable-wxbindcore was given. ! if test "${enable_wxbindcore+set}" = set; then ! enableval=$enable_wxbindcore; else enable_wxbindcore=auto *************** *** 2345,2351 **** ! # Check whether --enable-gl was given. ! if test "${enable_gl+set}" = set; then ! enableval=$enable_gl; else enable_wxbindgl=auto --- 2345,2351 ---- ! # Check whether --enable-wxbindgl was given. ! if test "${enable_wxbindgl+set}" = set; then ! enableval=$enable_wxbindgl; else enable_wxbindgl=auto *************** *** 2354,2360 **** ! # Check whether --enable-html was given. ! if test "${enable_html+set}" = set; then ! enableval=$enable_html; else enable_wxbindhtml=auto --- 2354,2360 ---- ! # Check whether --enable-wxbindhtml was given. ! if test "${enable_wxbindhtml+set}" = set; then ! enableval=$enable_wxbindhtml; else enable_wxbindhtml=auto *************** *** 2363,2369 **** ! # Check whether --enable-media was given. ! if test "${enable_media+set}" = set; then ! enableval=$enable_media; else enable_wxbindmedia=auto --- 2363,2369 ---- ! # Check whether --enable-wxbindmedia was given. ! if test "${enable_wxbindmedia+set}" = set; then ! enableval=$enable_wxbindmedia; else enable_wxbindmedia=auto *************** *** 2372,2378 **** ! # Check whether --enable-net was given. ! if test "${enable_net+set}" = set; then ! enableval=$enable_net; else enable_wxbindnet=auto --- 2372,2378 ---- ! # Check whether --enable-wxbindnet was given. ! if test "${enable_wxbindnet+set}" = set; then ! enableval=$enable_wxbindnet; else enable_wxbindnet=auto *************** *** 2381,2387 **** ! # Check whether --enable-richtext was given. ! if test "${enable_richtext+set}" = set; then ! enableval=$enable_richtext; else enable_wxbindrichtext=auto --- 2381,2387 ---- ! # Check whether --enable-wxbindrichtext was given. ! if test "${enable_wxbindrichtext+set}" = set; then ! enableval=$enable_wxbindrichtext; else enable_wxbindrichtext=auto *************** *** 2390,2396 **** ! # Check whether --enable-stc was given. ! if test "${enable_stc+set}" = set; then ! enableval=$enable_stc; else enable_wxbindstc=auto --- 2390,2396 ---- ! # Check whether --enable-wxbindstc was given. ! if test "${enable_wxbindstc+set}" = set; then ! enableval=$enable_wxbindstc; else enable_wxbindstc=auto *************** *** 2399,2405 **** ! # Check whether --enable-xml was given. ! if test "${enable_xml+set}" = set; then ! enableval=$enable_xml; else enable_wxbindxml=auto --- 2399,2405 ---- ! # Check whether --enable-wxbindxml was given. ! if test "${enable_wxbindxml+set}" = set; then ! enableval=$enable_wxbindxml; else enable_wxbindxml=auto *************** *** 2408,2414 **** ! # Check whether --enable-xrc was given. ! if test "${enable_xrc+set}" = set; then ! enableval=$enable_xrc; else enable_wxbindxrc=auto --- 2408,2414 ---- ! # Check whether --enable-wxbindxrc was given. ! if test "${enable_wxbindxrc+set}" = set; then ! enableval=$enable_wxbindxrc; else enable_wxbindxrc=auto |
|
From: John L. <jr...@us...> - 2008-01-14 18:10:36
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2082/wxLua/build/autoconf Modified Files: configure.ac Log Message: Fix --enable-wxbindxxx=no to work now. Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** configure.ac 14 Jan 2008 17:11:10 -0000 1.57 --- configure.ac 14 Jan 2008 18:10:31 -0000 1.58 *************** *** 57,61 **** AC_DEFUN([AC_BINDLIB_ENABLE], [ ! AC_ARG_ENABLE([$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is auto)])], --- 57,61 ---- AC_DEFUN([AC_BINDLIB_ENABLE], [ ! AC_ARG_ENABLE([wxbind$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is auto)])], *************** *** 63,78 **** ]) ! 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: --- 63,78 ---- ]) ! 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: *************** *** 103,127 **** [wxstedit_dir="$withval"], [wxstedit_dir=""]) ! UTILS_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app]) ! UTILS_YESNO_OPTCHECK([USE_WXLUACANAPP], [enable_wxluacan_app], [--enable-wxluacan-app]) ! UTILS_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app]) UTILS_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDADV], [enable_wxbindadv], [--enable-wxbindadv]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDAUI], [enable_wxbindaui], [--enable-wxbindaui]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDBASE], [enable_wxbindbase], [--enable-wxbindbase]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDCORE], [enable_wxbindcore], [--enable-wxbindcore]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDGL], [enable_wxbindgl], [--enable-wxbindgl]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDHTML], [enable_wxbindhtml], [--enable-wxbindhtml]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDMEDIA], [enable_wxbindmedia], [--enable-wxbindmedia]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDNET], [enable_wxbindnet], [--enable-wxbindnet]) UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDRICHTEXT], [enable_wxbindrichtext], [--enable-wxbindrichtext]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXML], [enable_wxbindxml], [--enable-wxbindxml]) ! UTILS_YESNOAUTO_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]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) --- 103,127 ---- [wxstedit_dir="$withval"], [wxstedit_dir=""]) ! UTILS_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app]) ! UTILS_YESNO_OPTCHECK([USE_WXLUACANAPP], [enable_wxluacan_app], [--enable-wxluacan-app]) ! UTILS_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app]) UTILS_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDADV], [enable_wxbindadv], [--enable-wxbindadv]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDAUI], [enable_wxbindaui], [--enable-wxbindaui]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDBASE], [enable_wxbindbase], [--enable-wxbindbase]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDCORE], [enable_wxbindcore], [--enable-wxbindcore]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDGL], [enable_wxbindgl], [--enable-wxbindgl]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDHTML], [enable_wxbindhtml], [--enable-wxbindhtml]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDMEDIA], [enable_wxbindmedia], [--enable-wxbindmedia]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDNET], [enable_wxbindnet], [--enable-wxbindnet]) UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDRICHTEXT], [enable_wxbindrichtext], [--enable-wxbindrichtext]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) ! UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXML], [enable_wxbindxml], [--enable-wxbindxml]) ! UTILS_YESNOAUTO_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]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) |
|
From: John L. <jr...@us...> - 2008-01-14 17:11:14
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10474/wxLua/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: Add --enable-systemlua=yes/no/auto and have a better check for a system Lua. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** aclocal.m4 14 Jan 2008 12:13:33 -0000 1.53 --- aclocal.m4 14 Jan 2008 17:11:10 -0000 1.54 *************** *** 1,6 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** configure.ac 14 Jan 2008 13:21:55 -0000 1.56 --- configure.ac 14 Jan 2008 17:11:10 -0000 1.57 *************** *** 92,95 **** --- 92,98 ---- [], [enable_customwxbind_install=yes]) + AC_ARG_ENABLE([systemlua], + [AC_HELP_STRING([--enable-systemlua], [Use the system Lua (default is auto)])], + [], [enable_systemlua=auto]) AC_ARG_WITH([lua-prefix], [AC_HELP_STRING([--with-lua-prefix], [Prefix where Lua is installed (optional)])], *************** *** 200,207 **** # exist then we use our built-in lua ! if test "$lua_dir" = ""; then UTILS_SAVE_COREVAR() LIBS="$LIBS -llua5.1" AC_LINK_IFELSE([ --- 203,219 ---- # exist then we use our built-in lua ! AC_MSG_CHECKING([if Lua 5.1 is installed]) ! ! if test ! "$enable_systemlua" = "no"; then UTILS_SAVE_COREVAR() + # force C compilation, not C++ + CPPFLAGS="-x c $CPPFLAGS" + + # use their Lua path --with-lua-prefix=$lua_dir + if test ! "$lua_dir" = ""; then + CPPFLAGS="-I$lua_dir $CPPFLAGS" + fi LIBS="$LIBS -llua5.1" AC_LINK_IFELSE([ *************** *** 215,221 **** # from other macros called by AC_LINK_IFELSE may interfere # in the final output - AC_MSG_CHECKING([if Lua 5.1 is installed]) if test "$LUA_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) USE_SYSTEM_LUA=1 else --- 227,232 ---- # from other macros called by AC_LINK_IFELSE may interfere # in the final output if test "$LUA_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes, using system Lua]) USE_SYSTEM_LUA=1 else *************** *** 223,226 **** --- 234,244 ---- USE_SYSTEM_LUA=0 + if test "$enable_systemlua" = "yes"; then + AC_MSG_ERROR([ + You specified --enable-systemlua=yes, but it is not useable. See config.log. + ]) + + fi + # LUA_DIR must always be an absolute path! LUA_DIR="`pwd`/$srcdir/modules/lua" *************** *** 231,237 **** else ! ! USE_SYSTEM_LUA=1 ! LUA_DIR="$lua_dir" fi --- 249,255 ---- else ! AC_MSG_RESULT([using built-in Lua --enable-systemlua=no]) ! USE_SYSTEM_LUA=0 ! LUA_DIR="`pwd`/$srcdir/modules/lua" fi |
|
From: John L. <jr...@us...> - 2008-01-14 17:11:14
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10474/wxLua Modified Files: configure Log Message: Add --enable-systemlua=yes/no/auto and have a better check for a system Lua. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** configure 14 Jan 2008 13:22:38 -0000 1.67 --- configure 14 Jan 2008 17:11:10 -0000 1.68 *************** *** 1448,1451 **** --- 1448,1452 ---- Installs wxBind sources for custom builds (default is yes) + --enable-systemlua Use the system Lua (default is auto) --enable-omf use OMF object format (OS/2) --disable-dependency-tracking *************** *** 2448,2451 **** --- 2449,2459 ---- + # Check whether --enable-systemlua was given. + if test "${enable_systemlua+set}" = set; then + enableval=$enable_systemlua; + else + enable_systemlua=auto + fi + # Check whether --with-lua-prefix was given. *************** *** 4801,4805 **** # exist then we use our built-in lua ! if test "$lua_dir" = ""; then --- 4809,4816 ---- # exist then we use our built-in lua ! { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 ! echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } ! ! if test ! "$enable_systemlua" = "no"; then *************** *** 4810,4813 **** --- 4821,4831 ---- + # force C compilation, not C++ + CPPFLAGS="-x c $CPPFLAGS" + + # use their Lua path --with-lua-prefix=$lua_dir + if test ! "$lua_dir" = ""; then + CPPFLAGS="-I$lua_dir $CPPFLAGS" + fi LIBS="$LIBS -llua5.1" *************** *** 4862,4870 **** # from other macros called by AC_LINK_IFELSE may interfere # in the final output - { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 - echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } if test "$LUA_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6; } USE_SYSTEM_LUA=1 else --- 4880,4886 ---- # from other macros called by AC_LINK_IFELSE may interfere # in the final output if test "$LUA_PRESENCE" = "1"; then ! { echo "$as_me:$LINENO: result: yes, using system Lua" >&5 ! echo "${ECHO_T}yes, using system Lua" >&6; } USE_SYSTEM_LUA=1 else *************** *** 4873,4876 **** --- 4889,4903 ---- USE_SYSTEM_LUA=0 + if test "$enable_systemlua" = "yes"; then + { { echo "$as_me:$LINENO: error: + You specified --enable-systemlua=yes, but it is not useable. See config.log. + " >&5 + echo "$as_me: error: + You specified --enable-systemlua=yes, but it is not useable. See config.log. + " >&2;} + { (exit 1); exit 1; }; } + + fi + # LUA_DIR must always be an absolute path! LUA_DIR="`pwd`/$srcdir/modules/lua" *************** *** 4886,4892 **** else ! ! USE_SYSTEM_LUA=1 ! LUA_DIR="$lua_dir" fi --- 4913,4920 ---- else ! { echo "$as_me:$LINENO: result: using built-in Lua --enable-systemlua=no" >&5 ! echo "${ECHO_T}using built-in Lua --enable-systemlua=no" >&6; } ! USE_SYSTEM_LUA=0 ! LUA_DIR="`pwd`/$srcdir/modules/lua" fi |
