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: John L. <jr...@us...> - 2008-01-10 23:06:58
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/build/msvc8 Modified Files: modules_mod_wxbindcore.vcproj modules_mod_wxbindhtml.vcproj Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: modules_mod_wxbindcore.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindcore.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbindcore.vcproj 16 Jul 2007 22:53:31 -0000 1.3 --- modules_mod_wxbindcore.vcproj 10 Jan 2008 23:06:25 -0000 1.4 *************** *** 361,369 **** <File RelativePath="..\..\wxbind\src\wxcore_sizer.cpp"/> <File RelativePath="..\..\wxbind\src\wxcore_windows.cpp"/> ! <File RelativePath="..\..\wxbind\src\wxcore_wxlprint.cpp"/> </Filter> <Filter Name="WXBINDCORE headers" UniqueIdentifier="{5FBF8BCF-E26A-57A8-A6C1-DD56B1757B7C}"> <File RelativePath="..\..\wxbind\include\wxcore_bind.h"/> ! <File RelativePath="..\..\wxbind\include\wxcore_wxlprint.h"/> </Filter> </Files> --- 361,369 ---- <File RelativePath="..\..\wxbind\src\wxcore_sizer.cpp"/> <File RelativePath="..\..\wxbind\src\wxcore_windows.cpp"/> ! <File RelativePath="..\..\wxbind\src\wxcore_wxlcore.cpp"/> </Filter> <Filter Name="WXBINDCORE headers" UniqueIdentifier="{5FBF8BCF-E26A-57A8-A6C1-DD56B1757B7C}"> <File RelativePath="..\..\wxbind\include\wxcore_bind.h"/> ! <File RelativePath="..\..\wxbind\include\wxcore_wxlcore.h"/> </Filter> </Files> Index: modules_mod_wxbindhtml.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindhtml.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbindhtml.vcproj 16 Jul 2007 22:53:31 -0000 1.3 --- modules_mod_wxbindhtml.vcproj 10 Jan 2008 23:06:25 -0000 1.4 *************** *** 345,353 **** <File RelativePath="..\..\wxbind\src\wxhtml_bind.cpp"/> <File RelativePath="..\..\wxbind\src\wxhtml_html.cpp"/> ! <File RelativePath="..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp"/> </Filter> <Filter Name="WXBINDHTML headers" UniqueIdentifier="{5AF684A6-84A8-5A30-9A27-BB986A973D98}"> <File RelativePath="..\..\wxbind\include\wxhtml_bind.h"/> ! <File RelativePath="..\..\wxbind\include\wxhtml_wxlhtmlwin.h"/> </Filter> </Files> --- 345,353 ---- <File RelativePath="..\..\wxbind\src\wxhtml_bind.cpp"/> <File RelativePath="..\..\wxbind\src\wxhtml_html.cpp"/> ! <File RelativePath="..\..\wxbind\src\wxhtml_wxlhtml.cpp"/> </Filter> <Filter Name="WXBINDHTML headers" UniqueIdentifier="{5AF684A6-84A8-5A30-9A27-BB986A973D98}"> <File RelativePath="..\..\wxbind\include\wxhtml_bind.h"/> ! <File RelativePath="..\..\wxbind\include\wxhtml_wxlhtml.h"/> </Filter> </Files> |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:58
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/build/msvc6 Modified Files: modules_mod_wxbindcore.dsp modules_mod_wxbindhtml.dsp Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: modules_mod_wxbindhtml.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindhtml.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbindhtml.dsp 16 Jul 2007 22:53:31 -0000 1.3 --- modules_mod_wxbindhtml.dsp 10 Jan 2008 23:06:25 -0000 1.4 *************** *** 467,471 **** # Begin Source File ! SOURCE=..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp # End Source File # End Group --- 467,471 ---- # Begin Source File ! SOURCE=..\..\wxbind\src\wxhtml_wxlhtml.cpp # End Source File # End Group *************** *** 479,483 **** # Begin Source File ! SOURCE=..\..\wxbind\include\wxhtml_wxlhtmlwin.h # End Source File # End Group --- 479,483 ---- # Begin Source File ! SOURCE=..\..\wxbind\include\wxhtml_wxlhtml.h # End Source File # End Group Index: modules_mod_wxbindcore.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindcore.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbindcore.dsp 16 Jul 2007 22:53:31 -0000 1.3 --- modules_mod_wxbindcore.dsp 10 Jan 2008 23:06:24 -0000 1.4 *************** *** 531,535 **** # Begin Source File ! SOURCE=..\..\wxbind\src\wxcore_wxlprint.cpp # End Source File # End Group --- 531,535 ---- # Begin Source File ! SOURCE=..\..\wxbind\src\wxcore_wxlcore.cpp # End Source File # End Group *************** *** 543,547 **** # Begin Source File ! SOURCE=..\..\wxbind\include\wxcore_wxlprint.h # End Source File # End Group --- 543,547 ---- # Begin Source File ! SOURCE=..\..\wxbind\include\wxcore_wxlcore.h # End Source File # End Group |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:58
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules Modified Files: Makefile.in Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Makefile.in 10 Jan 2008 17:04:25 -0000 1.64 --- Makefile.in 10 Jan 2008 23:06:24 -0000 1.65 *************** *** 238,242 **** wxbindcore_lib_wxcore_sizer.o \ wxbindcore_lib_wxcore_windows.o \ ! wxbindcore_lib_wxcore_wxlprint.o \ wxbindcore_lib_dummy.o WXBINDCORE_LIB_ODEP = \ --- 238,242 ---- wxbindcore_lib_wxcore_sizer.o \ wxbindcore_lib_wxcore_windows.o \ ! wxbindcore_lib_wxcore_wxlcore.o \ wxbindcore_lib_dummy.o WXBINDCORE_LIB_ODEP = \ *************** *** 265,269 **** wxbindcore_dll_wxcore_sizer.o \ wxbindcore_dll_wxcore_windows.o \ ! wxbindcore_dll_wxcore_wxlprint.o \ wxbindcore_dll_dummy.o WXBINDCORE_DLL_ODEP = \ --- 265,269 ---- wxbindcore_dll_wxcore_sizer.o \ wxbindcore_dll_wxcore_windows.o \ ! wxbindcore_dll_wxcore_wxlcore.o \ wxbindcore_dll_dummy.o WXBINDCORE_DLL_ODEP = \ *************** *** 294,298 **** wxbindhtml_lib_wxhtml_bind.o \ wxbindhtml_lib_wxhtml_html.o \ ! wxbindhtml_lib_wxhtml_wxlhtmlwin.o \ wxbindhtml_lib_dummy.o WXBINDHTML_LIB_ODEP = \ --- 294,298 ---- wxbindhtml_lib_wxhtml_bind.o \ wxbindhtml_lib_wxhtml_html.o \ ! wxbindhtml_lib_wxhtml_wxlhtml.o \ wxbindhtml_lib_dummy.o WXBINDHTML_LIB_ODEP = \ *************** *** 305,309 **** wxbindhtml_dll_wxhtml_bind.o \ wxbindhtml_dll_wxhtml_html.o \ ! wxbindhtml_dll_wxhtml_wxlhtmlwin.o \ wxbindhtml_dll_dummy.o WXBINDHTML_DLL_ODEP = \ --- 305,309 ---- wxbindhtml_dll_wxhtml_bind.o \ wxbindhtml_dll_wxhtml_html.o \ ! wxbindhtml_dll_wxhtml_wxlhtml.o \ wxbindhtml_dll_dummy.o WXBINDHTML_DLL_ODEP = \ *************** *** 2055,2059 **** @COND_SHARED_0@install_wxbindcore_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 2055,2059 ---- @COND_SHARED_0@install_wxbindcore_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 2063,2067 **** @COND_SHARED_0@uninstall_wxbindcore_lib_headers: ! @COND_SHARED_0@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done --- 2063,2067 ---- @COND_SHARED_0@uninstall_wxbindcore_lib_headers: ! @COND_SHARED_0@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done *************** *** 2088,2092 **** @COND_SHARED_1@install_wxbindcore_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 2088,2092 ---- @COND_SHARED_1@install_wxbindcore_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 2096,2100 **** @COND_SHARED_1@uninstall_wxbindcore_dll_headers: ! @COND_SHARED_1@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done --- 2096,2100 ---- @COND_SHARED_1@uninstall_wxbindcore_dll_headers: ! @COND_SHARED_1@ for f in wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done *************** *** 2179,2183 **** @COND_SHARED_0_USE_WXBINDHTML_1@install_wxbindhtml_lib_headers: @COND_SHARED_0_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \ @COND_SHARED_0_USE_WXBINDHTML_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 2179,2183 ---- @COND_SHARED_0_USE_WXBINDHTML_1@install_wxbindhtml_lib_headers: @COND_SHARED_0_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \ @COND_SHARED_0_USE_WXBINDHTML_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 2187,2191 **** @COND_SHARED_0_USE_WXBINDHTML_1@uninstall_wxbindhtml_lib_headers: ! @COND_SHARED_0_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \ @COND_SHARED_0_USE_WXBINDHTML_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXBINDHTML_1@ done --- 2187,2191 ---- @COND_SHARED_0_USE_WXBINDHTML_1@uninstall_wxbindhtml_lib_headers: ! @COND_SHARED_0_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \ @COND_SHARED_0_USE_WXBINDHTML_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXBINDHTML_1@ done *************** *** 2212,2216 **** @COND_SHARED_1_USE_WXBINDHTML_1@install_wxbindhtml_dll_headers: @COND_SHARED_1_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \ @COND_SHARED_1_USE_WXBINDHTML_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 2212,2216 ---- @COND_SHARED_1_USE_WXBINDHTML_1@install_wxbindhtml_dll_headers: @COND_SHARED_1_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \ @COND_SHARED_1_USE_WXBINDHTML_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXBINDHTML_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 2220,2224 **** @COND_SHARED_1_USE_WXBINDHTML_1@uninstall_wxbindhtml_dll_headers: ! @COND_SHARED_1_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \ @COND_SHARED_1_USE_WXBINDHTML_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXBINDHTML_1@ done --- 2220,2224 ---- @COND_SHARED_1_USE_WXBINDHTML_1@uninstall_wxbindhtml_dll_headers: ! @COND_SHARED_1_USE_WXBINDHTML_1@ for f in wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \ @COND_SHARED_1_USE_WXBINDHTML_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXBINDHTML_1@ done *************** *** 2732,2736 **** @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/dummy.cpp wxbind/src/wxadv_adv.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxadv_grid.cpp wxbind/src/wxaui_aui.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlprint.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxgl_gl.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_html.cpp wxbind/src/wxhtml_wxlhtmlwin.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxmedia_media.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxnet_net.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxrichtext_richtext.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxstc_stc.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxml_xml.cpp wxbind/src/wxxrc_bind.cpp wxbind/src/wxxrc_xrc.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ --- 2732,2736 ---- @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/dummy.cpp wxbind/src/wxadv_adv.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxadv_grid.cpp wxbind/src/wxaui_aui.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlcore.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxgl_gl.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_html.cpp wxbind/src/wxhtml_wxlhtml.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxmedia_media.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxnet_net.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxrichtext_richtext.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxstc_stc.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxml_xml.cpp wxbind/src/wxxrc_bind.cpp wxbind/src/wxxrc_xrc.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ *************** *** 3114,3119 **** $(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp ! wxbindcore_lib_wxcore_wxlprint.o: $(srcdir)/wxbind/src/wxcore_wxlprint.cpp $(WXBINDCORE_LIB_ODEP) ! $(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlprint.cpp wxbindcore_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_LIB_ODEP) --- 3114,3119 ---- $(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp ! wxbindcore_lib_wxcore_wxlcore.o: $(srcdir)/wxbind/src/wxcore_wxlcore.cpp $(WXBINDCORE_LIB_ODEP) ! $(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlcore.cpp wxbindcore_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_LIB_ODEP) *************** *** 3174,3179 **** $(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp ! wxbindcore_dll_wxcore_wxlprint.o: $(srcdir)/wxbind/src/wxcore_wxlprint.cpp $(WXBINDCORE_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlprint.cpp wxbindcore_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_DLL_ODEP) --- 3174,3179 ---- $(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp ! wxbindcore_dll_wxcore_wxlcore.o: $(srcdir)/wxbind/src/wxcore_wxlcore.cpp $(WXBINDCORE_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlcore.cpp wxbindcore_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_DLL_ODEP) *************** *** 3204,3209 **** $(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp ! wxbindhtml_lib_wxhtml_wxlhtmlwin.o: $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp $(WXBINDHTML_LIB_ODEP) ! $(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp wxbindhtml_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_LIB_ODEP) --- 3204,3209 ---- $(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp ! wxbindhtml_lib_wxhtml_wxlhtml.o: $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp $(WXBINDHTML_LIB_ODEP) ! $(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp wxbindhtml_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_LIB_ODEP) *************** *** 3216,3221 **** $(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp ! wxbindhtml_dll_wxhtml_wxlhtmlwin.o: $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp $(WXBINDHTML_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp wxbindhtml_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_DLL_ODEP) --- 3216,3221 ---- $(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp ! wxbindhtml_dll_wxhtml_wxlhtml.o: $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp $(WXBINDHTML_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp wxbindhtml_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_DLL_ODEP) |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:57
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/docs Modified Files: binding.html Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** binding.html 6 Aug 2007 01:46:32 -0000 1.26 --- binding.html 10 Jan 2008 23:06:24 -0000 1.27 *************** *** 233,238 **** this function you must also call the base class function for printing to operate correctly. The source code for the class ! wxLuaPrintout located in <i>modules/wxbind/include/wxcore_wxlprint.h</i> ! and <i>modules/wxbind/src/wxcore_wxlprint.cpp</i> and you should review it before reading further. You will also need to look --- 233,238 ---- this function you must also call the base class function for printing to operate correctly. The source code for the class ! wxLuaPrintout located in <i>modules/wxbind/include/wxcore_wxlcore.h</i> ! and <i>modules/wxbind/src/wxcore_wxlcore.cpp</i> and you should review it before reading further. You will also need to look *************** *** 894,896 **** %__X__<br> %__WXWINCE__<br> ! <br></body></html> \ No newline at end of file --- 894,896 ---- %__X__<br> %__WXWINCE__<br> ! <br></body></html> |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:57
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/build/autoconf Modified Files: configure.ac Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** configure.ac 10 Jan 2008 17:04:25 -0000 1.47 --- configure.ac 10 Jan 2008 23:06:24 -0000 1.48 *************** *** 93,96 **** --- 93,100 ---- [lua_dir="$withval"], [lua_dir=""]) + AC_ARG_WITH([wxstedit-prefix], + [AC_HELP_STRING([--with-wxstedit-prefix], [Prefix where wxStEdit is installed (optional)])], + [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]) *************** *** 133,136 **** --- 137,155 ---- AC_MSG_RESULT([$lua_dir]) + AC_MSG_CHECKING([for the --with-wxstedit-prefix option]) + if test ! $wxstedit_dir = ""; then + + # user explicitely provided a path to its own wxStEdit, check that it's an absolute path + # (or it won't work for out-of-tree builds) + case $wxstedit_dir in + /*) continue;; + *) + AC_MSG_ERROR([ + You must provide an absolute path for the --with-wxstedit-prefix option. + ]) + esac + fi + AC_MSG_RESULT([$wxstedit_dir]) + # Global wxLua options: *************** *** 297,300 **** --- 316,320 ---- else USE_WXBINDADV=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0" fi *************** *** 342,345 **** --- 362,366 ---- else USE_WXBINDAUI=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0" fi *************** *** 387,390 **** --- 408,412 ---- else USE_WXBINDGL=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0" fi *************** *** 432,435 **** --- 454,458 ---- else USE_WXBINDHTML=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0" fi *************** *** 477,480 **** --- 500,504 ---- else USE_WXBINDMEDIA=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0" fi *************** *** 526,529 **** --- 550,554 ---- dnl else dnl USE_WXBINDNET=0 + dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXNET=0" dnl fi *************** *** 571,574 **** --- 596,600 ---- else USE_WXBINDRICHTEXT=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0" fi *************** *** 620,623 **** --- 646,650 ---- dnl else dnl USE_WXBINDXML=0 + dnl CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXML=0" dnl fi *************** *** 665,668 **** --- 692,696 ---- else USE_WXBINDXRC=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0" fi *************** *** 751,754 **** --- 779,783 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi else *************** *** 757,764 **** --- 786,795 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi dnl --------------------------------------------------------------------------- + dnl wxStEdit check dnl -------------------------------------------------------------------------- *************** *** 770,773 **** --- 801,819 ---- minversion="1.2.4" + 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 + + # if it's not empty then add the search paths for the includes and lib + if test ! "$WXSTEDIT" = ""; then + CPPFLAGS="$CPPFLAGS -I$WXSTEDIT/include" + LDFLAGS="$LDFLAGS -L$WXSTEDIT/lib" + fi + WX_LIKE_LIBNAME([_WX_STEDIT_LIBNAME], [wxcode], [stedit]) AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h], *************** *** 802,810 **** AC_DEFUN([AC_ADD_WXLUA_LIBS], [ ! if test $3 == "1"; then ! TMP="" ! WX_LIKE_LIBNAME([TMP], [wxlua], [$4]) ! $1="-l$TMP $2" ! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$4-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $2" fi --- 848,855 ---- AC_DEFUN([AC_ADD_WXLUA_LIBS], [ ! if test $1 == "1"; then ! WX_LIKE_LIBNAME([_TMP], [wxlua], [$2]) ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$2-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 812,833 **** ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], ["1"], [wxlua]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUADEBUG], [wxluadebug]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUASOCKET], [wxluasocket]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDBASE], [wxbindbase]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDCORE], [wxbindcore]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDNET], [wxbindnet]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXML], [wxbindxml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDADV], [wxbindadv]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDAUI], [wxbindaui]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDGL], [wxbindgl]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDHTML], [wxbindhtml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDMEDIA], [wxbindmedia]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDRICHTEXT], [wxbindrichtext]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDSTC], [wxbindstc]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXRC], [wxbindxrc]) ! echo $WXLUA_LIBS AC_SUBST([WXLUA_LIBS]) --- 857,890 ---- ! AC_ADD_WXLUA_LIBS(["1"], [wxlua]) ! AC_ADD_WXLUA_LIBS([$USE_WXLUADEBUG], [wxluadebug]) ! AC_ADD_WXLUA_LIBS([$USE_WXLUASOCKET], [wxluasocket]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDBASE], [wxbindbase]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDCORE], [wxbindcore]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDNET], [wxbindnet]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDXML], [wxbindxml]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDADV], [wxbindadv]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDAUI], [wxbindaui]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDGL], [wxbindgl]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDHTML], [wxbindhtml]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDMEDIA], [wxbindmedia]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDRICHTEXT], [wxbindrichtext]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDSTC], [wxbindstc]) ! AC_ADD_WXLUA_LIBS([$USE_WXBINDXRC], [wxbindxrc]) ! # It is sometimes hard to dig out from the Makefiles these values ! AC_MSG_NOTICE([ ! Complier and linker directives summary. ! ! CFLAGS : '$CFLAGS' ! CXXFLAGS : '$CXXFLAGS' ! CPPFLAGS : '$CPPFLAGS' ! WX_CXXFLAGS : '$WX_CXXFLAGS' ! LDFLAGS : '$LDFLAGS' ! WX_LIBS : '$WX_LIBS' ! WXLUA_LIBS : '$WXLUA_LIBS' ! ! ]) AC_SUBST([WXLUA_LIBS]) |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:57
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua Modified Files: configure Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** configure 10 Jan 2008 17:04:23 -0000 1.59 --- configure 10 Jan 2008 23:06:23 -0000 1.60 *************** *** 1470,1473 **** --- 1470,1474 ---- (default is auto) --with-lua-prefix Prefix where Lua is installed (optional) + --with-wxstedit-prefix Prefix where wxStEdit is installed (optional) Some influential environment variables: *************** *** 2452,2455 **** --- 2453,2465 ---- + # Check whether --with-wxstedit-prefix was given. + if test "${with_wxstedit_prefix+set}" = set; then + withval=$with_wxstedit_prefix; wxstedit_dir="$withval" + else + wxstedit_dir="" + fi + + + { echo "$as_me:$LINENO: checking for the --enable-wxlua-app option" >&5 echo $ECHO_N "checking for the --enable-wxlua-app option... $ECHO_C" >&6; } *************** *** 2737,2740 **** --- 2747,2771 ---- echo "${ECHO_T}$lua_dir" >&6; } + { echo "$as_me:$LINENO: checking for the --with-wxstedit-prefix option" >&5 + echo $ECHO_N "checking for the --with-wxstedit-prefix option... $ECHO_C" >&6; } + if test ! $wxstedit_dir = ""; then + + # user explicitely provided a path to its own wxStEdit, check that it's an absolute path + # (or it won't work for out-of-tree builds) + case $wxstedit_dir in + /*) continue;; + *) + { { echo "$as_me:$LINENO: error: + You must provide an absolute path for the --with-wxstedit-prefix option. + " >&5 + echo "$as_me: error: + You must provide an absolute path for the --with-wxstedit-prefix option. + " >&2;} + { (exit 1); exit 1; }; } + esac + fi + { echo "$as_me:$LINENO: result: $wxstedit_dir" >&5 + echo "${ECHO_T}$wxstedit_dir" >&6; } + # Global wxLua options: *************** *** 6159,6162 **** --- 6190,6194 ---- else USE_WXBINDADV=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXADV=0" fi *************** *** 6261,6264 **** --- 6293,6297 ---- else USE_WXBINDAUI=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXAUI=0" fi *************** *** 6363,6366 **** --- 6396,6400 ---- else USE_WXBINDGL=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXGL=0" fi *************** *** 6465,6468 **** --- 6499,6503 ---- else USE_WXBINDHTML=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXHTML=0" fi *************** *** 6567,6570 **** --- 6602,6606 ---- else USE_WXBINDMEDIA=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXMEDIA=0" fi *************** *** 6673,6676 **** --- 6709,6713 ---- else USE_WXBINDRICHTEXT=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXRICHTEXT=0" fi *************** *** 6779,6782 **** --- 6816,6820 ---- else USE_WXBINDXRC=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXXRC=0" fi *************** *** 6923,6926 **** --- 6961,6965 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi else *************** *** 6929,6932 **** --- 6968,6972 ---- USE_WXLUAAPP=0 USE_WXLUAEDITAPP=0 + CPPFLAGS="$CPPFLAGS -DwxLUA_USEBINDING_WXSTC=0" fi *************** *** 6940,6943 **** --- 6980,6998 ---- minversion="1.2.4" + 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 + + # if it's not empty then add the search paths for the includes and lib + if test ! "$WXSTEDIT" = ""; then + CPPFLAGS="$CPPFLAGS -I$WXSTEDIT/include" + LDFLAGS="$LDFLAGS -L$WXSTEDIT/lib" + fi + wx_temp="wxcode""_""$WX_PORT" *************** *** 7099,7103 **** if test "1" == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7154,7157 ---- *************** *** 7112,7119 **** wx_temp="$wx_temp""_""wxlua""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxlua-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7166,7173 ---- wx_temp="$wx_temp""_""wxlua""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #"1"="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxlua-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7121,7125 **** if test $USE_WXLUADEBUG == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7175,7178 ---- *************** *** 7134,7141 **** wx_temp="$wx_temp""_""wxluadebug""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluadebug-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7187,7194 ---- wx_temp="$wx_temp""_""wxluadebug""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXLUADEBUG="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluadebug-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7143,7147 **** if test $USE_WXLUASOCKET == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7196,7199 ---- *************** *** 7156,7163 **** wx_temp="$wx_temp""_""wxluasocket""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluasocket-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7208,7215 ---- wx_temp="$wx_temp""_""wxluasocket""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXLUASOCKET="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxluasocket-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7166,7170 **** if test $USE_WXBINDBASE == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7218,7221 ---- *************** *** 7179,7186 **** wx_temp="$wx_temp""_""wxbindbase""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindbase-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7230,7237 ---- wx_temp="$wx_temp""_""wxbindbase""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDBASE="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindbase-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7188,7192 **** if test $USE_WXBINDCORE == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7239,7242 ---- *************** *** 7201,7208 **** wx_temp="$wx_temp""_""wxbindcore""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindcore-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7251,7258 ---- wx_temp="$wx_temp""_""wxbindcore""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDCORE="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindcore-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7210,7214 **** if test $USE_WXBINDNET == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7260,7263 ---- *************** *** 7223,7230 **** wx_temp="$wx_temp""_""wxbindnet""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindnet-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7272,7279 ---- wx_temp="$wx_temp""_""wxbindnet""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDNET="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindnet-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7232,7236 **** if test $USE_WXBINDXML == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7281,7284 ---- *************** *** 7245,7252 **** wx_temp="$wx_temp""_""wxbindxml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7293,7300 ---- wx_temp="$wx_temp""_""wxbindxml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDXML="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7254,7258 **** if test $USE_WXBINDADV == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7302,7305 ---- *************** *** 7267,7274 **** wx_temp="$wx_temp""_""wxbindadv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindadv-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7314,7321 ---- wx_temp="$wx_temp""_""wxbindadv""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDADV="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindadv-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7276,7280 **** if test $USE_WXBINDAUI == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7323,7326 ---- *************** *** 7289,7296 **** wx_temp="$wx_temp""_""wxbindaui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindaui-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7335,7342 ---- wx_temp="$wx_temp""_""wxbindaui""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDAUI="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindaui-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7298,7302 **** if test $USE_WXBINDGL == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7344,7347 ---- *************** *** 7311,7318 **** wx_temp="$wx_temp""_""wxbindgl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindgl-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7356,7363 ---- wx_temp="$wx_temp""_""wxbindgl""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDGL="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindgl-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7320,7324 **** if test $USE_WXBINDHTML == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7365,7368 ---- *************** *** 7333,7340 **** wx_temp="$wx_temp""_""wxbindhtml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindhtml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7377,7384 ---- wx_temp="$wx_temp""_""wxbindhtml""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDHTML="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindhtml-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7342,7346 **** if test $USE_WXBINDMEDIA == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7386,7389 ---- *************** *** 7355,7362 **** wx_temp="$wx_temp""_""wxbindmedia""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindmedia-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7398,7405 ---- wx_temp="$wx_temp""_""wxbindmedia""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDMEDIA="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindmedia-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7364,7368 **** if test $USE_WXBINDRICHTEXT == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7407,7410 ---- *************** *** 7377,7384 **** wx_temp="$wx_temp""_""wxbindrichtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindrichtext-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7419,7426 ---- wx_temp="$wx_temp""_""wxbindrichtext""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDRICHTEXT="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindrichtext-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7386,7390 **** if test $USE_WXBINDSTC == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7428,7431 ---- *************** *** 7399,7406 **** wx_temp="$wx_temp""_""wxbindstc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindstc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi --- 7440,7447 ---- wx_temp="$wx_temp""_""wxbindstc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDSTC="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindstc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi *************** *** 7408,7412 **** if test $USE_WXBINDXRC == "1"; then - TMP="" wx_temp="wxlua""_""$WX_PORT" --- 7449,7452 ---- *************** *** 7421,7433 **** wx_temp="$wx_temp""_""wxbindxrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! TMP=$wx_temp ! WXLUA_LIBS="-l$TMP $WXLUA_LIBS" ! #WXLUA_LIBS="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxrc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi ! echo $WXLUA_LIBS --- 7461,7497 ---- wx_temp="$wx_temp""_""wxbindxrc""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" ! _TMP=$wx_temp ! WXLUA_LIBS="-l$_TMP $WXLUA_LIBS" ! #$USE_WXBINDXRC="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_wxbindxrc-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $WXLUA_LIBS" fi ! # It is sometimes hard to dig out from the Makefiles these values ! { echo "$as_me:$LINENO: ! Complier and linker directives summary. ! ! CFLAGS : '$CFLAGS' ! CXXFLAGS : '$CXXFLAGS' ! CPPFLAGS : '$CPPFLAGS' ! WX_CXXFLAGS : '$WX_CXXFLAGS' ! LDFLAGS : '$LDFLAGS' ! WX_LIBS : '$WX_LIBS' ! WXLUA_LIBS : '$WXLUA_LIBS' ! ! " >&5 ! echo "$as_me: ! Complier and linker directives summary. ! ! CFLAGS : '$CFLAGS' ! CXXFLAGS : '$CXXFLAGS' ! CPPFLAGS : '$CPPFLAGS' ! WX_CXXFLAGS : '$WX_CXXFLAGS' ! LDFLAGS : '$LDFLAGS' ! WX_LIBS : '$WX_LIBS' ! WXLUA_LIBS : '$WXLUA_LIBS' ! ! " >&6;} |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:57
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/bindings/wxwidgets Modified Files: wxcore_print.i wxhtml_html.i Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: wxhtml_html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_html.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxhtml_html.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxhtml_html.i 10 Jan 2008 23:06:23 -0000 1.3 *************** *** 258,262 **** %if wxLUA_USE_wxLuaHtmlWindow ! %include "wxbind/include/wxhtml_wxlhtmlwin.h" %class wxLuaHtmlWindow, wxHtmlWindow --- 258,262 ---- %if wxLUA_USE_wxLuaHtmlWindow ! %include "wxbind/include/wxhtml_wxlhtml.h" %class wxLuaHtmlWindow, wxHtmlWindow Index: wxcore_print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_print.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_print.i 8 Jan 2008 00:55:35 -0000 1.4 --- wxcore_print.i 10 Jan 2008 23:06:23 -0000 1.5 *************** *** 59,63 **** %include "wxlua/include/wxlua_bind.h" // for wxLuaObject tag ! %include "wxbind/include/wxcore_wxlprint.h" %class %delete wxLuaPrintout, wxPrintout --- 59,63 ---- %include "wxlua/include/wxlua_bind.h" // for wxLuaObject tag ! %include "wxbind/include/wxcore_wxlcore.h" %class %delete wxLuaPrintout, wxPrintout |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/wxbind/include Modified Files: wxbinddefs.h wxcore_bind.h wxhtml_bind.h Added Files: wxcore_wxlcore.h wxhtml_wxlhtml.h Removed Files: wxcore_wxlprint.h wxhtml_wxlhtmlwin.h Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: wxcore_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxcore_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxcore_bind.h 10 Jan 2008 23:06:26 -0000 1.10 *************** *** 129,133 **** #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) ! #include "wxbind/include/wxcore_wxlprint.h" #include "wxlua/include/wxlua_bind.h" #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) --- 129,133 ---- #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) ! #include "wxbind/include/wxcore_wxlcore.h" #include "wxlua/include/wxlua_bind.h" #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxLUA_USE_wxLuaPrintout) --- wxhtml_wxlhtmlwin.h DELETED --- --- NEW FILE: wxhtml_wxlhtml.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Wrappers for wxHTML classes for wxLua // Author: J. Winwood // Created: June 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_WXLHTML_H #define WX_LUA_WXLHTML_H #include "wx/html/htmlwin.h" #include "wx/html/htmlcell.h" #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" #if wxLUA_USE_wxHTML // ---------------------------------------------------------------------------- // wxLuaHtmlWindow // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXHTML wxLuaHtmlWindow : public wxHtmlWindow { public: wxLuaHtmlWindow(const wxLuaState& wxlState, wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = wxT("wxLuaHtmlWindow")); virtual ~wxLuaHtmlWindow() {} #if wxCHECK_VERSION(2, 7, 0) virtual bool #else virtual void #endif OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event); virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y); virtual void OnLinkClicked(const wxHtmlLinkInfo& link); virtual void OnSetTitle(const wxString& title); private: wxLuaState m_wxlState; DECLARE_ABSTRACT_CLASS(wxLuaHtmlWindow) }; // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagEvent // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXHTML wxLuaHtmlWinTagEvent : public wxEvent { public: wxLuaHtmlWinTagEvent(wxEventType eventType = wxEVT_NULL); wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event); virtual ~wxLuaHtmlWinTagEvent() {} void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser); const wxHtmlTag* GetHtmlTag() const { return m_pHtmlTag; } wxHtmlWinParser* GetHtmlParser() const { return m_pHtmlParser; } bool GetParseInnerCalled() const { return m_fParseInnerCalled; } void SetParseInnerCalled(bool fParseInnerCalled) { m_fParseInnerCalled = fParseInnerCalled; } protected: virtual wxEvent* Clone() const { return new wxLuaHtmlWinTagEvent(*this); } private: const wxHtmlTag *m_pHtmlTag; wxHtmlWinParser *m_pHtmlParser; bool m_fParseInnerCalled; DECLARE_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent) }; typedef void (wxEvtHandler::*wxLuaHtmlWinTagEventFunction)(wxLuaHtmlWinTagEvent&); BEGIN_DECLARE_EVENT_TYPES() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BINDWXHTML, wxEVT_HTML_TAG_HANDLER, 0) END_DECLARE_EVENT_TYPES() #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL), #endif // wxLUA_USE_wxHTML #endif //WX_LUA_WXLHTML_H --- wxcore_wxlprint.h DELETED --- Index: wxbinddefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbinddefs.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxbinddefs.h 2 Aug 2007 18:25:42 -0000 1.8 --- wxbinddefs.h 10 Jan 2008 23:06:26 -0000 1.9 *************** *** 184,224 **** // ---------------------------------------------------------------------------- ! #define WXLUA_DECLARE_BIND_WXLUA extern WXDLLIMPEXP_WXLUA bool wxLuaBinding_wxlua_init(); // modules/wxlua ! #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket ! #define WXLUA_IMPLEMENT_BIND_WXLUA wxLuaBinding_wxlua_init(); ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init(); - #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXADV extern WXDLLIMPEXP_BINDWXADV bool wxLuaBinding_wxadv_init(); // modules/wxbind - #define WXLUA_DECLARE_BIND_WXNET extern WXDLLIMPEXP_BINDWXNET bool wxLuaBinding_wxnet_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init(); ! #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init(); ! #define WXLUA_IMPLEMENT_BIND_WXADV wxLuaBinding_wxadv_init(); ! #define WXLUA_IMPLEMENT_BIND_WXNET wxLuaBinding_wxnet_init(); ! #if wxUSE_XML ! #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init(); #else ! #define WXLUA_DECLARE_BIND_WXXML ! #define WXLUA_IMPLEMENT_BIND_WXXML ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXML is not used since wxUSE_XML=0" ! #endif //wxUSE_XML ! #if wxUSE_XRC ! #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init(); #else ! #define WXLUA_DECLARE_BIND_WXXRC ! #define WXLUA_IMPLEMENT_BIND_WXXRC ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXXRC is not used since wxUSE_XRC=0" ! #endif //wxUSE_XRC ! #if wxUSE_HTML #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init(); --- 184,247 ---- // ---------------------------------------------------------------------------- ! #if wxLUA_USEBINDING_WXLUA ! #define WXLUA_DECLARE_BIND_WXLUA extern WXDLLIMPEXP_WXLUA bool wxLuaBinding_wxlua_init(); // modules/wxlua ! #define WXLUA_IMPLEMENT_BIND_WXLUA wxLuaBinding_wxlua_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXLUA ! #define WXLUA_IMPLEMENT_BIND_WXLUA ! #endif // wxLUA_USEBINDING_WXLUA ! #if wxLUA_USEBINDING_WXLUASOCKET ! #define WXLUA_DECLARE_BIND_WXLUASOCKET extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET wxLuaBinding_wxluasocket_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXLUASOCKET ! #define WXLUA_IMPLEMENT_BIND_WXLUASOCKET ! #endif //wxLUA_USEBINDING_WXLUASOCKET ! #if wxLUA_USEBINDING_WXADV ! #define WXLUA_DECLARE_BIND_WXADV extern WXDLLIMPEXP_BINDWXADV bool wxLuaBinding_wxadv_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXADV wxLuaBinding_wxadv_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXADV ! #define WXLUA_IMPLEMENT_BIND_WXADV ! #endif // wxLUA_USEBINDING_WXADV + #if wxLUA_USEBINDING_WXAUI && wxUSE_AUI + #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind + #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init(); + #else + #define WXLUA_DECLARE_BIND_WXAUI + #define WXLUA_IMPLEMENT_BIND_WXAUI + //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0" + #endif // wxLUA_USEBINDING_WXAUI && wxUSE_AUI ! #if wxLUA_USEBINDING_WXBASE ! #define WXLUA_DECLARE_BIND_WXBASE extern WXDLLIMPEXP_BINDWXBASE bool wxLuaBinding_wxbase_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXBASE wxLuaBinding_wxbase_init(); #else ! #define WXLUA_DECLARE_BIND_WXBASE ! #define WXLUA_IMPLEMENT_BIND_WXBASE ! #endif // wxLUA_USEBINDING_WXBASE ! #if wxLUA_USEBINDING_WXCORE ! #define WXLUA_DECLARE_BIND_WXCORE extern WXDLLIMPEXP_BINDWXCORE bool wxLuaBinding_wxcore_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXCORE wxLuaBinding_wxcore_init(); #else ! #define WXLUA_DECLARE_BIND_WXCORE ! #define WXLUA_IMPLEMENT_BIND_WXCORE ! #endif // wxLUA_USEBINDING_WXCORE ! #if wxLUA_USEBINDING_WXGL && wxUSE_GLCANVAS ! #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXGL ! #define WXLUA_IMPLEMENT_BIND_WXGL ! #endif // wxLUA_USEBINDING_WXGL && wxUSE_GLCANVAS ! ! #if wxLUA_USEBINDING_WXHTML && wxUSE_HTML #define WXLUA_DECLARE_BIND_WXHTML extern WXDLLIMPEXP_BINDWXHTML bool wxLuaBinding_wxhtml_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXHTML wxLuaBinding_wxhtml_init(); *************** *** 226,242 **** #define WXLUA_DECLARE_BIND_WXHTML #define WXLUA_IMPLEMENT_BIND_WXHTML ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXHTML is not used since wxUSE_HTML=0" ! #endif //wxUSE_HTML ! ! #if wxUSE_AUI ! #define WXLUA_DECLARE_BIND_WXAUI extern WXDLLIMPEXP_BINDWXAUI bool wxLuaBinding_wxaui_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXAUI wxLuaBinding_wxaui_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXAUI ! #define WXLUA_IMPLEMENT_BIND_WXAUI ! //#warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXAUI is not used since wxUSE_AUI=0" ! #endif //wxUSE_AUI ! #if wxUSE_MEDIACTRL #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init(); --- 249,255 ---- #define WXLUA_DECLARE_BIND_WXHTML #define WXLUA_IMPLEMENT_BIND_WXHTML ! #endif // wxLUA_USEBINDING_WXHTML && wxUSE_HTML ! #if wxLUA_USEBINDING_WXMEDIA && wxUSE_MEDIACTRL #define WXLUA_DECLARE_BIND_WXMEDIA extern WXDLLIMPEXP_BINDWXMEDIA bool wxLuaBinding_wxmedia_init(); // modules/wxbind #define WXLUA_IMPLEMENT_BIND_WXMEDIA wxLuaBinding_wxmedia_init(); *************** *** 244,264 **** #define WXLUA_DECLARE_BIND_WXMEDIA #define WXLUA_IMPLEMENT_BIND_WXMEDIA ! // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXMEDIA is not used since wxUSE_MEDIACTRL=0" ! #endif //wxUSE_MEDIACTRL ! #if wxUSE_GLCANVAS ! #define WXLUA_DECLARE_BIND_WXGL extern WXDLLIMPEXP_BINDWXGL bool wxLuaBinding_wxgl_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXGL wxLuaBinding_wxgl_init(); #else ! #define WXLUA_DECLARE_BIND_WXGL ! #define WXLUA_IMPLEMENT_BIND_WXGL ! // warning "WXLUA_DECLARE/IMPLEMENT_BIND_WXGL is not used since wxUSE_GLCANVAS=0" ! #endif //wxUSE_GLCANVAS ! // Unfortunately there's no checks for this ! #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init(); // ---------------------------------------------------------------------------- // Declare all the bindings --- 257,305 ---- #define WXLUA_DECLARE_BIND_WXMEDIA #define WXLUA_IMPLEMENT_BIND_WXMEDIA ! #endif // wxLUA_USEBINDING_WXMEDIA && wxUSE_MEDIACTRL ! #if wxLUA_USEBINDING_WXNET ! #define WXLUA_DECLARE_BIND_WXNET extern WXDLLIMPEXP_BINDWXNET bool wxLuaBinding_wxnet_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXNET wxLuaBinding_wxnet_init(); #else ! #define WXLUA_DECLARE_BIND_WXNET ! #define WXLUA_IMPLEMENT_BIND_WXNET ! #endif // wxLUA_USEBINDING_WXNET ! #if wxLUA_USEBINDING_WXRICHTEXT && wxUSE_RICHTEXT ! #define WXLUA_DECLARE_BIND_WXRICHTEXT extern WXDLLIMPEXP_BINDWXRICHTEXT bool wxLuaBinding_wxrichtext_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXRICHTEXT wxLuaBinding_wxrichtext_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXRICHTEXT ! #define WXLUA_IMPLEMENT_BIND_WXRICHTEXT ! #endif // wxLUA_USEBINDING_WXRICHTEXT && wxUSE_RICHTEXT ! ! #if wxLUA_USEBINDING_WXSTC ! #define WXLUA_DECLARE_BIND_WXSTC extern WXDLLIMPEXP_BINDWXSTC bool wxLuaBinding_wxstc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXSTC wxLuaBinding_wxstc_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXSTC ! #define WXLUA_IMPLEMENT_BIND_WXSTC ! #endif // wxLUA_USEBINDING_WXSTC ! ! #if wxLUA_USEBINDING_WXXML && wxUSE_XML ! #define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML bool wxLuaBinding_wxxml_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXXML ! #define WXLUA_IMPLEMENT_BIND_WXXML ! #endif // wxLUA_USEBINDING_WXXML && wxUSE_XML ! ! #if wxLUA_USEBINDING_WXXRC && wxUSE_XRC ! #define WXLUA_DECLARE_BIND_WXXRC extern WXDLLIMPEXP_BINDWXXRC bool wxLuaBinding_wxxrc_init(); // modules/wxbind ! #define WXLUA_IMPLEMENT_BIND_WXXRC wxLuaBinding_wxxrc_init(); ! #else ! #define WXLUA_DECLARE_BIND_WXXRC ! #define WXLUA_IMPLEMENT_BIND_WXXRC ! #endif // wxLUA_USEBINDING_WXXRC && wxUSE_XRC // ---------------------------------------------------------------------------- + // Simplified macros to declare and implement the bindings + // Note the order of them which follows the C++ linking order. // Declare all the bindings Index: wxhtml_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxhtml_bind.h 22 Dec 2007 06:07:11 -0000 1.9 --- wxhtml_bind.h 10 Jan 2008 23:06:27 -0000 1.10 *************** *** 62,66 **** #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) ! #include "wxbind/include/wxhtml_wxlhtmlwin.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) --- 62,66 ---- #if (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) ! #include "wxbind/include/wxhtml_wxlhtml.h" #endif // (wxLUA_USE_wxHTML && wxUSE_HTML) && (wxLUA_USE_wxLuaHtmlWindow) --- NEW FILE: wxcore_wxlcore.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Wrappers around wxCore classes for wxLua // Author: J. Winwood // Created: July 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_WXLCORE_H #define WX_LUA_WXLCORE_H #include "wx/print.h" #include "wxbind/include/wxbinddefs.h" #include "wxluasetup.h" #if wxLUA_USE_wxLuaPrintout class WXDLLIMPEXP_WXLUA wxLuaObject; // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BINDWXCORE wxLuaPrintout : public wxPrintout { public: wxLuaPrintout(const wxLuaState& wxlState, const wxString& title = wxT("Printout"), wxLuaObject *pObject = NULL); // added function so you don't have to override GetPageInfo void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo); // overrides virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo); virtual bool HasPage(int pageNum); virtual bool OnBeginDocument(int startPage, int endPage); virtual void OnEndDocument(); virtual void OnBeginPrinting(); virtual void OnEndPrinting(); virtual void OnPreparePrinting(); virtual bool OnPrintPage(int pageNumber); wxLuaObject *GetID() const { return m_pObject; } // Dummy test function to directly verify that the binding virtual functions really work. virtual wxString TestVirtualFunctionBinding(const wxString& val); static int ms_test_int; private: wxLuaState m_wxlState; wxLuaObject *m_pObject; int m_minPage; int m_maxPage; int m_pageFrom; int m_pageTo; DECLARE_ABSTRACT_CLASS(wxLuaPrintout) }; #endif //wxLUA_USE_wxLuaPrintout #if wxLUA_USE_wxArtProvider #include "wx/artprov.h" class WXDLLIMPEXP_BINDWXCORE wxLuaArtProvider : public wxArtProvider { public: wxLuaArtProvider(const wxLuaState& wxlState); // Get the default size of an icon for a specific client virtual wxSize DoGetSizeHint(const wxArtClient& client); // Derived classes must override this method to create requested // art resource. This method is called only once per instance's // lifetime for each requested wxArtID. virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size); private: wxLuaState m_wxlState; DECLARE_ABSTRACT_CLASS(wxLuaArtProvider) }; #endif // wxLUA_USE_wxArtProvider #endif //WX_LUA_WXLCORE_H |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/wxbind/src Modified Files: Makefile_wxcore Makefile_wxhtml Added Files: wxcore_wxlcore.cpp wxhtml_wxlhtml.cpp Removed Files: wxcore_wxlprint.cpp wxhtml_wxlhtmlwin.cpp Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. --- NEW FILE: wxhtml_wxlhtml.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaHtmlWindow.cpp // Purpose: Provide an interface to wxHtmlWindow for wxLua. // Author: J. Winwood. // Created: June 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/datetime.h" #include "wxbind/include/wxhtml_wxlhtml.h" #include "wxbind/include/wxhtml_bind.h" //#include "wxlua/include/wxlcallb.h" #if wxLUA_USE_wxHTML DEFINE_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER) // ---------------------------------------------------------------------------- // wxLuaHtmlWindow // ---------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxLuaHtmlWindow, wxHtmlWindow) wxLuaHtmlWindow::wxLuaHtmlWindow(const wxLuaState& wxlState, wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) :wxHtmlWindow(parent, id, pos, size, style, name) { m_wxlState = wxlState; } #if wxCHECK_VERSION(2,7,0) bool #else void #endif wxLuaHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) { bool fResult = false; #if wxCHECK_VERSION(2,7,0) bool ret = false; #endif if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnCellClicked", true)) { lua_State *L = m_wxlState.GetLuaState(); int nOldTop = lua_gettop(L); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaHtmlWindow, true); m_wxlState.wxluaT_PushUserDataType(cell, g_wxluatype_wxHtmlCell, true); lua_pushnumber(L, x); lua_pushnumber(L, y); m_wxlState.wxluaT_PushUserDataType((void *) &event, g_wxluatype_wxMouseEvent, true); m_wxlState.LuaPCall(5, 1); fResult = (lua_tonumber(L, -1) != 0); lua_settop(L, nOldTop); if (fResult) { #if wxCHECK_VERSION(2,7,0) ret = #endif wxHtmlWindow::OnCellClicked(cell, x, y, event); } } else { #if wxCHECK_VERSION(2,7,0) ret = #endif wxHtmlWindow::OnCellClicked(cell, x, y, event); } m_wxlState.SetCallBaseClassFunction(false); // clear flag always #if wxCHECK_VERSION(2,7,0) return ret; #endif } void wxLuaHtmlWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y) { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnCellMouseHover", true)) { lua_State *L = m_wxlState.GetLuaState(); int nOldTop = lua_gettop(L); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaHtmlWindow, true); m_wxlState.wxluaT_PushUserDataType(cell, g_wxluatype_wxHtmlCell, true); lua_pushnumber(L, x); lua_pushnumber(L, y); m_wxlState.LuaPCall(4, 0); lua_settop(L, nOldTop); } else wxHtmlWindow::OnCellMouseHover(cell, x, y); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } void wxLuaHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnLinkClicked", true)) { lua_State *L = m_wxlState.GetLuaState(); int nOldTop = lua_gettop(L); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaHtmlWindow, true); m_wxlState.wxluaT_PushUserDataType((void *) &link, g_wxluatype_wxHtmlLinkInfo, true); m_wxlState.LuaPCall(2, 0); lua_settop(L, nOldTop); } else wxHtmlWindow::OnLinkClicked(link); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } void wxLuaHtmlWindow::OnSetTitle(const wxString& title) { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnSetTitle", true)) { lua_State *L = m_wxlState.GetLuaState(); int nOldTop = lua_gettop(L); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaHtmlWindow, true); m_wxlState.lua_PushString(title); m_wxlState.LuaPCall(2, 0); lua_settop(L, nOldTop); } else wxHtmlWindow::OnSetTitle(title); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagHandler // ---------------------------------------------------------------------------- class wxLuaHtmlWinTagHandler : public wxHtmlWinTagHandler { public: wxLuaHtmlWinTagHandler() {} virtual wxString GetSupportedTags() { return wxT("LUA"); } virtual bool HandleTag(const wxHtmlTag& tag) { wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER); htmlEvent.SetTagInfo(&tag, m_WParser); if (wxTheApp->ProcessEvent(htmlEvent)) return htmlEvent.GetParseInnerCalled(); return false; } }; class wxLuaHtmlTagsModule : public wxHtmlTagsModule { DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule) public: virtual void FillHandlersTable(wxHtmlWinParser *parser) { parser->AddTagHandler(new wxLuaHtmlWinTagHandler); } }; IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlTagsModule, wxHtmlTagsModule) // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagEvent // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent) wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(wxEventType eventType) :wxEvent(wxID_ANY, eventType), m_pHtmlTag(NULL), m_pHtmlParser(NULL), m_fParseInnerCalled(false) { } wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(const wxLuaHtmlWinTagEvent& event) :wxEvent(event), m_pHtmlTag(event.m_pHtmlTag), m_pHtmlParser(event.m_pHtmlParser), m_fParseInnerCalled(event.m_fParseInnerCalled) { } void wxLuaHtmlWinTagEvent::SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser) { m_pHtmlTag = pHtmlTag; m_pHtmlParser = pParser; } #endif //wxLUA_USE_wxHTML Index: Makefile_wxcore =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile_wxcore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile_wxcore 16 Jul 2007 19:34:44 -0000 1.1 --- Makefile_wxcore 10 Jan 2008 23:06:27 -0000 1.2 *************** *** 45,49 **** wxcore_sizer.cpp \ wxcore_windows.cpp \ ! wxcore_wxlprint.cpp OBJECTS=$(SOURCES:.cpp=.o) --- 45,49 ---- wxcore_sizer.cpp \ wxcore_windows.cpp \ ! wxcore_wxlcore.cpp OBJECTS=$(SOURCES:.cpp=.o) --- wxcore_wxlprint.cpp DELETED --- Index: Makefile_wxhtml =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile_wxhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile_wxhtml 16 Jul 2007 19:34:44 -0000 1.1 --- Makefile_wxhtml 10 Jan 2008 23:06:27 -0000 1.2 *************** *** 29,33 **** wxhtml_bind.cpp \ wxhtml_html.cpp \ ! wxhtml_wxlhtmlwin.cpp OBJECTS=$(SOURCES:.cpp=.o) --- 29,33 ---- wxhtml_bind.cpp \ wxhtml_html.cpp \ ! wxhtml_wxlhtml.cpp OBJECTS=$(SOURCES:.cpp=.o) --- NEW FILE: wxcore_wxlcore.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaPrinting.cpp // Purpose: Provide an interface to wxPrintout for wxLua. // Author: J. Winwood. // Created: July 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/datetime.h" #include "wxbind/include/wxcore_wxlcore.h" #if wxLUA_USE_wxLuaPrintout // This lua tag is defined in bindings extern int g_wxluatype_wxLuaPrintout; // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- int wxLuaPrintout::ms_test_int = -1; IMPLEMENT_ABSTRACT_CLASS(wxLuaPrintout, wxPrintout) wxLuaPrintout::wxLuaPrintout(const wxLuaState& wxlState, const wxString& title, wxLuaObject *pObject) :wxPrintout(title), m_wxlState(wxlState), m_pObject(pObject), m_minPage(0), m_maxPage(0), m_pageFrom(0), m_pageTo(0) { } void wxLuaPrintout::SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo) { m_minPage = minPage; m_maxPage = maxPage; m_pageFrom = pageFrom; m_pageTo = pageTo; } void wxLuaPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { *minPage = *maxPage = *pageFrom = *pageTo = 0; if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "GetPageInfo", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.LuaPCall(1, 4); *minPage = (int)m_wxlState.GetNumberType(-4); *maxPage = (int)m_wxlState.GetNumberType(-3); *pageFrom = (int)m_wxlState.GetNumberType(-2); *pageTo = (int)m_wxlState.GetNumberType(-1); m_wxlState.lua_SetTop(nOldTop); } else { *minPage = m_minPage; *maxPage = m_maxPage; *pageFrom = m_pageFrom; *pageTo = m_pageTo; } m_wxlState.SetCallBaseClassFunction(false); // clear flag always } bool wxLuaPrintout::HasPage(int pageNum) { bool fResult = false; if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "HasPage", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.lua_PushNumber(pageNum); m_wxlState.LuaPCall(2, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); } else fResult = wxPrintout::HasPage(pageNum); m_wxlState.SetCallBaseClassFunction(false); // clear flag always return fResult; } // Notes about virtual functions: // // This is the call list using the wxPrintf statements in wxLuaPrintout::OnBeginDocument // for the wxLua code (see printing.wx.lua sample for complete listing) // // previewPrintout = wxLuaPrintout("Test print") // ... // previewPrintout.OnBeginDocument = function(self, startPage, endPage) // return self:base_OnBeginDocument(startPage, endPage) // end // ... // local preview = wx.wxPrintPreview(printerPrintout, previewPrintout, printDialogData) // // wxLuaPrintout::OnBeginDocument 1 call base 0 // wxlua_getTableFunc func 'base_OnBeginDocument' pClass -1220355700 'wxLuaPrintout', userdata 1, lightuserdata 0, ttag 207, class_tag 207 lua_State 139252808 wxLuaStateRefData 139155808 call base 1 // wxLua_wxPrintout_OnBeginDocument 1 (this is the wxLua binding function for wxPrintout::OnBeginDocument) // wxLuaPrintout::OnBeginDocument 1 call base 1 // wxLuaPrintout::OnBeginDocument 3 call base 1 // wxPrintout::OnBeginDocument (this is the call to the wxWidgets function in it's library) // wxLuaPrintout::OnBeginDocument 4 call base 1 // wxLuaPrintout::OnBeginDocument 2 call base 0 // wxLuaPrintout::OnBeginDocument 4 call base 0 bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage) { // NOTE: The wxLua program MUST call the base class, see printing.wx.lua bool fResult = true; //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 1 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginDocument", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.lua_PushNumber(startPage); m_wxlState.lua_PushNumber(endPage); m_wxlState.LuaPCall(3, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 2 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); } else { //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 3 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); fResult = wxPrintout::OnBeginDocument(startPage, endPage); } //wxPrintf(wxT("wxLuaPrintout::OnBeginDocument 4 call base %d\n"), m_wxlState.GetCallBaseClassFunction()); m_wxlState.SetCallBaseClassFunction(false); // clear flag always return fResult; } void wxLuaPrintout::OnEndDocument() { // NOTE: The wxLua program MUST call the base class, see printing.wx.lua if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndDocument", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } else wxPrintout::OnEndDocument(); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } void wxLuaPrintout::OnBeginPrinting() { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginPrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } else wxPrintout::OnBeginPrinting(); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } void wxLuaPrintout::OnEndPrinting() { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndPrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } else wxPrintout::OnEndPrinting(); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } void wxLuaPrintout::OnPreparePrinting() { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPreparePrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.LuaPCall(1, 0); m_wxlState.lua_SetTop(nOldTop); } else wxPrintout::OnPreparePrinting(); m_wxlState.SetCallBaseClassFunction(false); // clear flag always } bool wxLuaPrintout::OnPrintPage(int pageNum) { bool fResult = false; if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPrintPage", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.lua_PushNumber(pageNum); m_wxlState.LuaPCall(2, 1); fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_SetTop(nOldTop); } // no else since this is pure virtual m_wxlState.SetCallBaseClassFunction(false); // clear flag always return fResult; } wxString wxLuaPrintout::TestVirtualFunctionBinding(const wxString& val) { wxString result(val + wxT("-Base")); if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "TestVirtualFunctionBinding", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaPrintout, true); m_wxlState.lua_PushString(val); m_wxlState.LuaPCall(2, 1); result = m_wxlState.GetwxStringType(-1); m_wxlState.lua_SetTop(nOldTop); } // no else since wxPrintout doesn't have this function m_wxlState.SetCallBaseClassFunction(false); // clear flag always return result; } // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxLuaArtProvider, wxArtProvider) #include "wxbind/include/wxcore_bind.h" // for wxLua_wxObject_wxSize extern int g_wxluatype_wxLuaArtProvider; extern int g_wxluatype_wxSize; extern int g_wxluatype_wxBitmap; wxLuaArtProvider::wxLuaArtProvider(const wxLuaState& wxlState) : m_wxlState(wxlState) { } wxSize wxLuaArtProvider::DoGetSizeHint(const wxArtClient& client) { wxSize size; if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "DoGetSizeHint", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaArtProvider, true); m_wxlState.lua_PushString(client); m_wxlState.LuaPCall(2, 1); wxSize *s = (wxSize*)m_wxlState.GetUserDataType(-1, g_wxluatype_wxSize); if (s) size = *s; m_wxlState.lua_SetTop(nOldTop); } else size = wxArtProvider::DoGetSizeHint(client); m_wxlState.SetCallBaseClassFunction(false); // clear flag always return size; } wxBitmap wxLuaArtProvider::CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size) { wxBitmap bitmap; if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "CreateBitmap", true)) { int nOldTop = m_wxlState.lua_GetTop(); m_wxlState.wxluaT_PushUserDataType(this, g_wxluatype_wxLuaArtProvider, true); m_wxlState.lua_PushString(id); m_wxlState.lua_PushString(client); // allocate a new object using the copy constructor wxSize* s = new wxSize(size); // add the new object to the tracked memory list m_wxlState.AddGCObject((void*)s, new wxLua_wxObject_wxSize((wxSize*)s)); m_wxlState.wxluaT_PushUserDataType(s, g_wxluatype_wxSize, true); m_wxlState.LuaPCall(4, 1); wxBitmap *b = (wxBitmap*)m_wxlState.GetUserDataType(-1, g_wxluatype_wxBitmap); if (b) bitmap = *b; m_wxlState.lua_SetTop(nOldTop); } // no else since this is pure virtual m_wxlState.SetCallBaseClassFunction(false); // clear flag always return bitmap; } #endif // wxLUA_USE_wxLuaPrintout --- wxhtml_wxlhtmlwin.cpp DELETED --- |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluasetup.h 16 Jul 2007 19:34:44 -0000 1.20 --- wxluasetup.h 10 Jan 2008 23:06:27 -0000 1.21 *************** *** 1,7 **** ! // Automatically generated by utils/get_luasetup edit as necessary. #ifndef __WXLUA_SETUP__ #define __WXLUA_SETUP__ #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 --- 1,64 ---- ! ///////////////////////////////////////////////////////////////////////////// ! // Name: wxluasetup.h ! // Purpose: Control what wxLua bindings for wxWidgets are built ! // Author: John Labenski ! // Created: 1/10/2008 ! // Copyright: (c) 2008 John Labenski ! // Licence: wxWidgets licence ! ///////////////////////////////////////////////////////////////////////////// ! #ifndef __WXLUA_SETUP__ #define __WXLUA_SETUP__ + // Enable or disable the wxLua bindings based on the libs + + #ifndef wxLUA_USEBINDING_WXLUA + #define wxLUA_USEBINDING_WXLUA 1 + #endif + #ifndef wxLUA_USEBINDING_WXLUASOCKET + #define wxLUA_USEBINDING_WXLUASOCKET 1 + #endif + + // Enable or disable whole wxWidgets bindings based on the libs + + #ifndef wxLUA_USEBINDING_WXADV + #define wxLUA_USEBINDING_WXADV 1 + #endif + #ifndef wxLUA_USEBINDING_WXAUI + #define wxLUA_USEBINDING_WXAUI 1 + #endif + #ifndef wxLUA_USEBINDING_WXBASE + #define wxLUA_USEBINDING_WXBASE 1 + #endif + #ifndef wxLUA_USEBINDING_WXCORE + #define wxLUA_USEBINDING_WXCORE 1 + #endif + #ifndef wxLUA_USEBINDING_WXGL + #define wxLUA_USEBINDING_WXGL 1 + #endif + #ifndef wxLUA_USEBINDING_WXHTML + #define wxLUA_USEBINDING_WXHTML 1 + #endif + #ifndef wxLUA_USEBINDING_WXMEDIA + #define wxLUA_USEBINDING_WXMEDIA 1 + #endif + #ifndef wxLUA_USEBINDING_WXNET + #define wxLUA_USEBINDING_WXNET 1 + #endif + #ifndef wxLUA_USEBINDING_WXRICHTEXT + #define wxLUA_USEBINDING_WXRICHTEXT 0 + #endif + #ifndef wxLUA_USEBINDING_WXSTC + #define wxLUA_USEBINDING_WXSTC 1 + #endif + #ifndef wxLUA_USEBINDING_WXXML + #define wxLUA_USEBINDING_WXXML 1 + #endif + #ifndef wxLUA_USEBINDING_WXXRC + #define wxLUA_USEBINDING_WXXRC 1 + #endif + + // Enable or disable single or small groups of classes, see bindings/*.i #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 |
|
From: John L. <jr...@us...> - 2008-01-10 23:06:31
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.vc 9 Jan 2008 04:59:58 -0000 1.74 --- makefile.vc 10 Jan 2008 23:06:26 -0000 1.75 *************** *** 345,349 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_151)$(VAR_199) /DWIN32 \ --- 345,349 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_151)$(VAR_199) /DWIN32 \ *************** *** 377,381 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_164)$(VAR_199) /DWIN32 \ --- 377,381 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_164)$(VAR_199) /DWIN32 \ *************** *** 421,425 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_205)$(VAR_199) /DWIN32 \ --- 421,425 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_205)$(VAR_199) /DWIN32 \ *************** *** 437,441 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_218)$(VAR_199) /DWIN32 \ --- 437,441 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_218)$(VAR_199) /DWIN32 \ *************** *** 2041,2045 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** --- 2041,2045 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** *************** *** 2101,2105 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** --- 2101,2105 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** *************** *** 2131,2135 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** --- 2131,2135 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** *************** *** 2143,2147 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** --- 2143,2147 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.bcc 9 Jan 2008 04:59:58 -0000 1.75 --- makefile.bcc 10 Jan 2008 23:06:25 -0000 1.76 *************** *** 385,389 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 385,389 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 414,418 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 414,418 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 451,455 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 451,455 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 464,468 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 464,468 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 1909,1913 **** $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** --- 1909,1913 ---- $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** *************** *** 1969,1973 **** $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** --- 1969,1973 ---- $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** *************** *** 1999,2003 **** $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** --- 1999,2003 ---- $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** *************** *** 2011,2015 **** $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** --- 2011,2015 ---- $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/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:58 -0000 1.74 --- makefile.wat 10 Jan 2008 23:06:26 -0000 1.75 *************** *** 988,992 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & --- 988,992 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & *************** *** 1015,1019 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & --- 1015,1019 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & *************** *** 1046,1050 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & --- 1046,1050 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & *************** *** 1057,1061 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & --- 1057,1061 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & *************** *** 2178,2182 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< --- 2178,2182 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< *************** *** 2238,2242 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< --- 2238,2242 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< *************** *** 2268,2272 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< --- 2268,2272 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< *************** *** 2280,2284 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< --- 2280,2284 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.gcc 9 Jan 2008 04:59:58 -0000 1.74 --- makefile.gcc 10 Jan 2008 23:06:25 -0000 1.75 *************** *** 287,291 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.o WXBINDCORE_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 287,291 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.o WXBINDCORE_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 314,318 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.o WXBINDGL_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 314,318 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.o WXBINDGL_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 343,347 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.o WXBINDHTML_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 343,347 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.o WXBINDHTML_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 354,358 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.o WXBINDMEDIA_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 354,358 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.o WXBINDMEDIA_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 1894,1898 **** $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.o: ../../wxbind/src/wxcore_wxlprint.cpp $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1894,1898 ---- $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.o: ../../wxbind/src/wxcore_wxlcore.cpp $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1954,1958 **** $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.o: ../../wxbind/src/wxcore_wxlprint.cpp $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1954,1958 ---- $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.o: ../../wxbind/src/wxcore_wxlcore.cpp $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< *************** *** 1984,1988 **** $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.o: ../../wxbind/src/wxhtml_wxlhtmlwin.cpp $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1984,1988 ---- $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.o: ../../wxbind/src/wxhtml_wxlhtml.cpp $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1996,2000 **** $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.o: ../../wxbind/src/wxhtml_wxlhtmlwin.cpp $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1996,2000 ---- $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.o: ../../wxbind/src/wxhtml_wxlhtml.cpp $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:36
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/modules Modified Files: Makefile.in Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Makefile.in 9 Jan 2008 04:59:57 -0000 1.63 --- Makefile.in 10 Jan 2008 17:04:25 -0000 1.64 *************** *** 51,54 **** --- 51,55 ---- WX_PORT = @WX_PORT@ LUA_DIR = @LUA_DIR@ + WXLUA_LIBS = @WXLUA_LIBS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 1627,1636 **** @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.4 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.0.4.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_13 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 5 -current_version 5 ### Targets: ### --- 1628,1637 ---- @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.7 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.0.7.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_13 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 8 -current_version 8 ### Targets: ### *************** *** 2720,2724 **** @COND_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindgl-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: --- 2721,2725 ---- @COND_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:33
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/build/bakefiles Modified Files: wxluabase.bkl Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wxluabase.bkl 31 Jul 2007 23:15:12 -0000 1.42 --- wxluabase.bkl 10 Jan 2008 17:04:25 -0000 1.43 *************** *** 40,44 **** --> ! <set var="WXLUA_RELEASE">4</set> <!-- The default version of wxWidgets which is used by wxLua; --- 40,44 ---- --> ! <set var="WXLUA_RELEASE">7</set> <!-- The default version of wxWidgets which is used by wxLua; *************** *** 110,124 **** Trying to use an invalid name will generate an error at bake-time. --> ! <define-tag name="wxlua-lib" rules="exe,dll,module"> ! <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbindadv', 'wxbindaui', 'wxbindbase', 'wxbindcore', 'wxbindgl', 'wxbindhtml', 'wxbindmedia', 'wxbindnet', 'wxbindrichtext', 'wxbindstc', 'wxbindxml', 'wxbindxrc', 'lua' ]"> ! <error>Invalid wxlua-lib value !</error> ! </if> ! <if cond="value=='lua'"> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua'"> ! <wxlike-lib prefix="wxlua">$(value)</wxlike-lib> ! </if> ! </define-tag> <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers --> --- 110,150 ---- Trying to use an invalid name will generate an error at bake-time. --> ! ! <set var="WXLUA_LIB_LIST"> ! wxluasocket wxluadebug wxlua wxbindadv wxbindaui wxbindbase wxbindcore wxbindgl wxbindhtml wxbindmedia wxbindnet wxbindrichtext wxbindstc wxbindxml wxbindxrc lua ! </set> ! ! <if cond="FORMAT=='autoconf'"> ! <option name="WXLUA_LIBS"/> ! ! <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()"> ! <error>Unknown wxLua library given in the wxlib-lib tag</error> ! </if> ! ! <if cond="value=='lua'"> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua'"> ! <wxlike-lib prefix="wxlua">$(value)</wxlike-lib> ! </if> ! </define-tag> ! </if> <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers --> *************** *** 141,145 **** <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </define-tag> --- 167,171 ---- <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <!-- MUST BE LAST! --> </define-tag> *************** *** 163,167 **** <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </define-tag> --- 189,193 ---- <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <!-- MUST BE LAST! --> </define-tag> |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:32
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/apps Modified Files: Makefile.in Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Makefile.in 9 Jan 2008 04:59:57 -0000 1.65 --- Makefile.in 10 Jan 2008 17:04:24 -0000 1.66 *************** *** 39,42 **** --- 39,43 ---- WX_PORT = @WX_PORT@ LUA_DIR = @LUA_DIR@ + WXLUA_LIBS = @WXLUA_LIBS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ *************** *** 221,225 **** ../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) -llua5.1 -lm $(__app_lua___mac_setfilecmd) --- 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) *************** *** 233,237 **** @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) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___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) *************** *** 245,249 **** @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) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindgl-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(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) --- 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) *************** *** 265,269 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/EXECUTABLE/wxLua/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ --- 266,270 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/EXECUTABLE/wxLua/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/VERSION/2.8.7/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ *************** *** 280,284 **** @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) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindgl-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -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) --- 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) *************** *** 300,304 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/EXECUTABLE/wxLuaEdit/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ --- 301,305 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/EXECUTABLE/wxLuaEdit/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/VERSION/2.8.7/" \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ *************** *** 315,319 **** @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) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___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) *************** *** 335,339 **** @COND_USE_WXLUACANAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUACANAPP_1@ -e "s/EXECUTABLE/wxLuaCan/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXLUACANAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist @COND_USE_WXLUACANAPP_1@ --- 336,340 ---- @COND_USE_WXLUACANAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUACANAPP_1@ -e "s/EXECUTABLE/wxLuaCan/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/VERSION/2.8.7/" \ @COND_USE_WXLUACANAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist @COND_USE_WXLUACANAPP_1@ *************** *** 350,354 **** @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) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindadv-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindaui-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindbase-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindcore-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindhtml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindmedia-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindnet-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxml-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindxrc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___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) *************** *** 370,374 **** @COND_USE_WXLUAFREEZEAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUAFREEZEAPP_1@ -e "s/EXECUTABLE/wxLuaFreeze/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/VERSION/2.8.4/" \ @COND_USE_WXLUAFREEZEAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist @COND_USE_WXLUAFREEZEAPP_1@ --- 371,375 ---- @COND_USE_WXLUAFREEZEAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_USE_WXLUAFREEZEAPP_1@ -e "s/EXECUTABLE/wxLuaFreeze/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/VERSION/2.8.7/" \ @COND_USE_WXLUAFREEZEAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist @COND_USE_WXLUAFREEZEAPP_1@ |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:32
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/build/autoconf Modified Files: configure.ac Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** configure.ac 1 Aug 2007 10:08:22 -0000 1.46 --- configure.ac 10 Jan 2008 17:04:25 -0000 1.47 *************** *** 24,30 **** - - - ## CONFIGURE OPTIONS ##################################################################### --- 24,27 ---- *************** *** 60,64 **** AC_ARG_ENABLE([$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list="$wxbind_list,$1"]) ]) --- 57,61 ---- AC_ARG_ENABLE([$1], [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], ! [], [enable_wxbind$1=yes; wxbind_list_enabled="$wxbind_list_enabled,$1"]) ]) *************** *** 77,81 **** # remove initial comma: ! wxbind_list=${wxbind_list:1} AC_ARG_ENABLE([wxluadebug], --- 74,78 ---- # remove initial comma: ! wxbind_list_enabled=${wxbind_list_enabled:1} AC_ARG_ENABLE([wxluadebug], *************** *** 145,148 **** --- 142,159 ---- + AC_DEFUN([AC_WXLUABINDLIB_ENABLE], + [ + AC_ARG_ENABLE([$1], + [AC_HELP_STRING([--enable-wxbind$1], [Compiles the wxLua bindings for $2 lib (default is yes)])], + [], [enable_wxbind$1=yes; wxbind_list_enabled="$wxbind_list_enabled,$1"]) + ]) + + + ## Init libs, we will add to these as we check for their existance + ##################################################################### + + + WXLIB_NAMES="net,xml,core,base" + WXLUA_LIBS="-llua5.1" *************** *** 159,163 **** AC_PROG_CXX ! WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) --- 170,175 ---- AC_PROG_CXX ! #WXLIBS_REQUIRED="aui,xrc,html,adv,net,xml,core,base" FIXME should also check for net and xml ! WXLIBS_REQUIRED="net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) *************** *** 243,246 **** --- 255,670 ---- + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_ADV( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_ADV], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_ADV_LIBNAME], [wx], [adv]) + LIBS="$LIBS -l$_WX_ADV_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Adv bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/grid.h>], + [wxGrid dummy(NULL, -1, wxDefaultPosition);]) + ], + [WXADV_PRESENCE=1], [WXADV_PRESENCE=0]) + + if test "$WXADV_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_ADV + if [[[ "$USE_WXBINDADV" = "1" && "$WXADV_PRESENCE" = "1" ]]]; then + # add adv to the list of wx-config --libs + WXLIB_NAMES="adv,$WXLIB_NAMES" + else + USE_WXBINDADV=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_AUI( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_AUI], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_AUI_LIBNAME], [wx], [aui]) + LIBS="$LIBS -l$_WX_AUI_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets AUI bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/aui/aui.h>], + [wxAuiPaneInfo dummy();]) + ], + [WXAUI_PRESENCE=1], [WXAUI_PRESENCE=0]) + + if test "$WXAUI_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_AUI + if test "$WXAUI_PRESENCE" = "1"; then + # add aui to the list of wx-config --libs + WXLIB_NAMES="aui,$WXLIB_NAMES" + else + USE_WXBINDAUI=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_GL( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_GL], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) + LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/glcanvas.h>], + [wxGLCanvas dummy(NULL, -1, wxDefaultPosition);]) + ], + [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) + + if test "$WXGL_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_GL + if test "$WXGL_PRESENCE" = "1"; then + # add gl to the list of wx-config --libs + WXLIB_NAMES="gl,$WXLIB_NAMES" + else + USE_WXBINDGL=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_HTML( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_HTML], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_HTML_LIBNAME], [wx], [html]) + LIBS="$LIBS -l$_WX_HTML_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets HTML bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/html/htmlcell.h>], + [wxHtmlSelection dummy;]) + ], + [WXHTML_PRESENCE=1], [WXHTML_PRESENCE=0]) + + if test "$WXHTML_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_HTML + if test "$WXHTML_PRESENCE" = "1"; then + # add html to the list of wx-config --libs + WXLIB_NAMES="html,$WXLIB_NAMES" + else + USE_WXBINDHTML=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_MEDIA( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_MEDIA], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_MEDIA_LIBNAME], [wx], [media]) + LIBS="$LIBS -l$_WX_MEDIA_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Media bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/mediactrl.h>], + [wxMediaCtrl dummy();]) + ], + [WXMEDIA_PRESENCE=1], [WXMEDIA_PRESENCE=0]) + + if test "$WXMEDIA_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_MEDIA + if test "$WXMEDIA_PRESENCE" = "1"; then + # add media to the list of wx-config --libs + WXLIB_NAMES="media,$WXLIB_NAMES" + else + USE_WXBINDMEDIA=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_NET( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_NET], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) + LIBS="$LIBS -l$_WX_NET_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Net bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/socket.h>], + [wxSocketClient dummy;]) + ], + [WXNET_PRESENCE=1], [WXNET_PRESENCE=0]) + + if test "$WXNET_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + dnl FIXME - no check for net since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_net-2.8.so + dnl WX_CHECK_FOR_NET + dnl if test "$WXNET_PRESENCE" = "1"; then + dnl # let's add Net binding library to the libraries to link + dnl # so that if the user wants to use wxLua bindings to wxNet he + dnl # won't have linking errors + dnl WX_LIKE_LIBNAME([_WX_NET_LIBNAME], [wx], [net]) + dnl WX_LIBS="-l$_WX_NET_LIBNAME $WX_LIBS" + dnl else + dnl USE_WXBINDNET=0 + dnl fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_RICHTEXT( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_RICHTEXT], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_RICHTEXT_LIBNAME], [wx], [richtext]) + LIBS="$LIBS -l$_WX_RICHTEXT_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets Richtext bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/richtext/richtextctrl.h>], + [wxRichTextCtrl dummy;]) + ], + [WXRICHTEXT_PRESENCE=1], [WXRICHTEXT_PRESENCE=0]) + + if test "$WXRICHTEXT_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_RICHTEXT + if test "$WXRICHTEXT_PRESENCE" = "1"; then + # add richtext to the list of wx-config --libs + WXLIB_NAMES="richtext,$WXLIB_NAMES" + else + USE_WXBINDRICHTEXT=0 + fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_XML( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_XML], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) + LIBS="$LIBS -l$_WX_XML_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets XML bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/xml/xml.h>], + [wxXmlProperty dummy;]) + ], + [WXXML_PRESENCE=1], [WXXML_PRESENCE=0]) + + if test "$WXXML_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + dnl FIXME - no check for XML since we can't use WX_LIKE_LIBNAME because it's libwx_baseud_xml-2.8.so + dnl WX_CHECK_FOR_XML + dnl if test "$WXXML_PRESENCE" = "1"; then + dnl # let's add XML binding library to the libraries to link + dnl # so that if the user wants to use wxLua bindings to XML he + dnl # won't have linking errors + dnl WX_LIKE_LIBNAME([_WX_XML_LIBNAME], [wx], [xml]) + dnl WX_LIBS="-l$_WX_XML_LIBNAME $WX_LIBS" + dnl else + dnl USE_WXBINDXML=0 + dnl fi + + + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_XRC( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_XRC], + [ + dnl save original flags into support variables + UTILS_SAVE_COREVAR() + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + WX_LIKE_LIBNAME([_WX_XRC_LIBNAME], [wx], [xrc]) + LIBS="$LIBS -l$_WX_XRC_LIBNAME $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets XRC bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/xrc/xh_all.h>], + [wxSizerXmlHandler dummy;]) + ], + [WXXRC_PRESENCE=1], [WXXRC_PRESENCE=0]) + + if test "$WXXRC_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + UTILS_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_XRC + if test "$WXXRC_PRESENCE" = "1"; then + # add xrc to the list of wx-config --libs + WXLIB_NAMES="xrc,$WXLIB_NAMES" + else + USE_WXBINDXRC=0 + fi + dnl --------------------------------------------------------------------------- *************** *** 276,280 **** dnl check for this component presence ! AC_MSG_CHECKING([if wxSTC contrib is available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <wx/stc/stc.h>], --- 700,704 ---- dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets STC contrib is available]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <wx/stc/stc.h>], *************** *** 302,308 **** if test $ac_cv_prog_stc_set = "1"; then ! # add to the library to link to the wxSTC lib ! WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" --- 726,734 ---- if test $ac_cv_prog_stc_set = "1"; then ! dnl # add to the library to link to the wxSTC lib ! dnl WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! dnl WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" ! # add stc to the list of wx-config --libs ! WXLIB_NAMES="stc,$WXLIB_NAMES" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" *************** *** 333,336 **** --- 759,766 ---- fi + + dnl --------------------------------------------------------------------------- + dnl -------------------------------------------------------------------------- + # check for the wxStEdit component... # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol *************** *** 363,428 **** fi - dnl --------------------------------------------------------------------------- - dnl WX_CHECK_FOR_GL( - dnl [action if found], - dnl [action if not found]) - dnl --------------------------------------------------------------------------- - AC_DEFUN([WX_CHECK_FOR_GL], - [ - dnl save original flags into support variables - UTILS_SAVE_COREVAR() ! dnl add to the compilation & link flags the wxWidgets flags ! dnl ! dnl NOTE: this is very important since the test program ! dnl we will compile needs to be linked against wx ! dnl and the configure script will use these *FLAGS ! dnl variables and it cannot be told to use other flags. ! dnl ! dnl NOTE2: we don't want to put into *FLAGS variables the ! dnl WX_* variable values since the Makefile.in for ! dnl a wxpresets-based application already merges ! dnl the *FLAGS contents with WX_* vars ! dnl ! dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and ! dnl thus we don't need to add the WX_CPPFLAGS to both ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! dnl before WX_LIBS we want the lib of GL ! WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" ! dnl check for this component presence ! AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) ! AC_LINK_IFELSE([ ! AC_LANG_PROGRAM([#include <wx/glcanvas.h>], ! [wxGLCanvas dummy(NULL);]) ! ], ! [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) ! if test "$WXGL_PRESENCE" = "1"; then ! AC_MSG_RESULT([yes]) ! $1 ! else ! AC_MSG_RESULT([no]) ! $2 ! fi - dnl restore the original flags - UTILS_RESTORE_COREVAR() - ]) ! WX_CHECK_FOR_GL ! if test "$WXGL_PRESENCE" = "1"; then ! # let's add OpenGL binding library to the libraries to link ! # so that if the user wants to use wxLua bindings to wxOpenGL he ! # won't have linking errors ! WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! WX_LIBS="-l$_WX_GL_LIBNAME $WX_LIBS" ! fi # Produce some useful info for pkg-config: --- 793,839 ---- fi dnl --------------------------------------------------------------------------- ! # recreate the wx-config --libs after determining what libs we've found ! WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $WXLIB_NAMES` ! WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $WXLIB_NAMES 2>/dev/null` ! AC_DEFUN([AC_ADD_WXLUA_LIBS], ! [ ! if test $3 == "1"; then ! TMP="" ! WX_LIKE_LIBNAME([TMP], [wxlua], [$4]) ! $1="-l$TMP $2" ! #$1="-lwxlua_\$(WX_PORT)\$(WXLIBPOSTFIX)_$4-\$(WX_VERSION_MAJOR).\$(WX_VERSION_MINOR) $2" ! fi ! ]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], ["1"], [wxlua]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUADEBUG], [wxluadebug]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXLUASOCKET], [wxluasocket]) ! ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDBASE], [wxbindbase]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDCORE], [wxbindcore]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDNET], [wxbindnet]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXML], [wxbindxml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDADV], [wxbindadv]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDAUI], [wxbindaui]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDGL], [wxbindgl]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDHTML], [wxbindhtml]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDMEDIA], [wxbindmedia]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDRICHTEXT], [wxbindrichtext]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDSTC], [wxbindstc]) ! AC_ADD_WXLUA_LIBS([WXLUA_LIBS], [$WXLUA_LIBS], [$USE_WXBINDXRC], [wxbindxrc]) ! ! echo $WXLUA_LIBS ! ! AC_SUBST([WXLUA_LIBS]) + dnl -------------------------------------------------------------------------- + dnl -------------------------------------------------------------------------- # Produce some useful info for pkg-config: *************** *** 512,516 **** # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) # macro must be used ! --- 923,927 ---- # declared as: # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> ! # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) # macro must be used ! *************** *** 541,570 **** fi ! ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - wxBindSTC module: yes"], ! [" - wxBindSTC module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - wxLuaDebug module: yes"], ! [" - wxLuaDebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - wxLuaSocket module: yes"], ! [" - wxLuaSocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - Lua module: yes"], ! [" - Lua module: no"]) # miscellaneous --- 952,1001 ---- fi ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDADV], ! [" - enable_wxbindadv module: yes"], ! [" - enable_wxbindadv module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDAUI], ! [" - enable_wxbindaui module: yes"], ! [" - enable_wxbindaui module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDBASE], ! [" - enable_wxbindbase module: yes"], ! [" - enable_wxbindbase module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDCORE], ! [" - enable_wxbindcore module: yes"], ! [" - enable_wxbindcore module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDGL], ! [" - enable_wxbindgl module: yes"], ! [" - enable_wxbindgl module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDHTML], ! [" - enable_wxbindhtml module: yes"], ! [" - enable_wxbindhtml module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDMEDIA], ! [" - enable_wxbindmedia module: yes"], ! [" - enable_wxbindmedia module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDNET], ! [" - enable_wxbindnet module: yes"], ! [" - enable_wxbindnet module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDRICHTEXT], ! [" - enable_wxbindrichtext module: yes"], ! [" - enable_wxbindrichtext module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXBINDSTC], ! [" - enable_wxbindstc module: yes"], ! [" - enable_wxbindstc module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDXML], ! [" - enable_wxbindxml module: yes"], ! [" - enable_wxbindxml module: no"]) ! UTILS_BOOLOPT_SUMMARY([USE_WXBINDXRC], ! [" - enable_wxbindxrc module: yes"], ! [" - enable_wxbindxrc module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) # miscellaneous *************** *** 574,579 **** [" - install custom wxBind stuff: no"]) ! echo " - wxBind modules activated: " ! echo " $wxbind_list" WX_STANDARD_OPTIONS_SUMMARY_MSG_END --- 1005,1013 ---- [" - install custom wxBind stuff: no"]) ! echo " - wxBind modules enabled: " ! echo " $wxbind_list_enabled" ! ! echo " - wxBind modules that will be created: " ! echo " $WXLIB_NAMES" WX_STANDARD_OPTIONS_SUMMARY_MSG_END |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:31
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** common.bkl 2 Aug 2007 18:25:42 -0000 1.16 --- common.bkl 10 Jan 2008 17:04:25 -0000 1.17 *************** *** 110,114 **** <!-- ================================================================== --> ! <define-rule name="wxlua_lib" extends="lib"> <template> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> --- 110,133 ---- <!-- ================================================================== --> ! <!-- NOTE: This tag should be the same as the same as the non-autoconf wxlua-lib tag --> ! <define-tag name="wxluamodule-lib" rules="exe,dll,module"> ! <if cond="value not in WXLUA_LIB_LIST.split()"> ! <error>Unknown wxLua library given in the wxluamodule-lib tag</error> ! </if> ! ! <if cond="value=='lua'"> ! <sys-lib>lua5.1</sys-lib> ! </if> ! <if cond="value!='lua'"> ! <wxlike-lib prefix="wxlua">$(value)</wxlike-lib> ! </if> ! </define-tag> ! <template id="wxluamodule-lib" template="wx-lib,wxlua-base"> ! <!-- we don't need to add anything else to wxlua-base template --> ! </template> ! ! <tag-info name="wxluamodule-lib" position="before:wxlua-req-libs"/> ! ! <define-rule name="wxluamodule_lib" extends="lib"> <template> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> *************** *** 153,162 **** </define-tag> <define-tag name="module-dep"> ! <wxlua-lib>$(value)</wxlua-lib> <depends>$(value)_lib</depends> </define-tag> </define-rule> ! <define-rule name="wxlua_dll" extends="dll"> <template> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> --- 172,181 ---- </define-tag> <define-tag name="module-dep"> ! <wxluamodule-lib>$(value)</wxluamodule-lib> <depends>$(value)_lib</depends> </define-tag> </define-rule> ! <define-rule name="wxluamodule_dll" extends="dll"> <template> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> *************** *** 216,220 **** </define-tag> <define-tag name="module-dep"> ! <wxlua-lib>$(value)</wxlua-lib> <depends>$(value)_dll</depends> </define-tag> --- 235,239 ---- </define-tag> <define-tag name="module-dep"> ! <wxluamodule-lib>$(value)</wxluamodule-lib> <depends>$(value)_dll</depends> </define-tag> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** modules.bkl 1 Aug 2007 10:08:23 -0000 1.48 --- modules.bkl 10 Jan 2008 17:04:25 -0000 1.49 *************** *** 17,28 **** <include file="common.bkl" once="1"/> <!-- Here it's important to use template_append and not just template ! --> ! <define-rule name="wxlua_stdlib" extends="wxlua_lib"> ! <template template_append="wxlua-lib"> <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> </template> </define-rule> ! <define-rule name="wxlua_stddll" extends="wxlua_dll"> <template template_append="wxlua"> <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> --- 17,29 ---- <include file="common.bkl" once="1"/> + <!-- Here it's important to use template_append and not just template ! --> ! <define-rule name="wxlua_stdlib" extends="wxluamodule_lib"> ! <template template_append="wxluamodule-lib"> <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> </template> </define-rule> ! <define-rule name="wxlua_stddll" extends="wxluamodule_dll"> <template template_append="wxlua"> <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> |
|
From: John L. <jr...@us...> - 2008-01-10 17:04:31
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15167/wxLua Modified Files: configure Log Message: Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those Also create only the wxLua bind libs for the existing wxWidgets libs Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to link to for the modules. Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** configure 1 Aug 2007 10:08:22 -0000 1.58 --- configure 10 Jan 2008 17:04:23 -0000 1.59 *************** *** 697,700 **** --- 697,701 ---- LUA_PLATFORM_SPECIFIC_CFLAGS LUA_PLATFORM_SPECIFIC_LDFLAGS + WXLUA_LIBS WXLUA_MODNAMES WXLUA_LIBNAMES *************** *** 1994,2000 **** [...1705 lines suppressed...] else echo "USE_LUAMODULE is $USE_LUAMODULE" *************** *** 10705,10710 **** ! echo " - wxBind modules activated: " ! echo " $wxbind_list" --- 11714,11722 ---- ! echo " - wxBind modules enabled: " ! echo " $wxbind_list_enabled" ! ! echo " - wxBind modules that will be created: " ! echo " $WXLIB_NAMES" |
|
From: John L. <jr...@us...> - 2008-01-10 00:25:29
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17466/wxLua/build/autoconf Modified Files: aclocal.m4 Added Files: bakefile-dllar.m4 bakefile-lang.m4 bakefile.m4 Log Message: Ran acregen.sh using automake 1.10 The code removed from aclocal.m4 are in bakefile-dllar.m4 bakefile.m4 Added bakefile-dllar.m4 bakefile-lang.m4 bakefile.m4 from frm-bakefile so when it's regenerated we always get the same results. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** aclocal.m4 1 Aug 2007 10:08:22 -0000 1.49 --- aclocal.m4 10 Jan 2008 00:25:16 -0000 1.50 *************** *** 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, [...1616 lines suppressed...] ! #include "${D}header" ! EOT ! # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ ! sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ ! rm -f ${D}file ${D}dfile ${D}{filename}.o ! fi ! exit ${D}{?} ! fi ! EOF ! dnl ===================== bk-make-pch ends here ===================== ! ]) ! m4_include([wxwin.m4]) --- 12,16 ---- # PARTICULAR PURPOSE. ! m4_include([bakefile-dllar.m4]) ! m4_include([bakefile.m4]) m4_include([wxwin.m4]) --- NEW FILE: bakefile.m4 --- dnl dnl This file is part of Bakefile (http://www.bakefile.org) dnl dnl Copyright (C) 2003-2007 Vaclav Slavik and others dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), dnl to deal in the Software without restriction, including without limitation dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, dnl and/or sell copies of the Software, and to permit persons to whom the dnl Software is furnished to do so, subject to the following conditions: dnl dnl The above copyright notice and this permission notice shall be included in dnl all copies or substantial portions of the Software. dnl dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER [...1098 lines suppressed...] if test "x${GCC_PCH}" = "x1" ; then # can do this because gcc is >= 3.4: ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" elif test "x${ICC_PCH}" = "x1" ; then filename=pch_gen-${D}${D} file=${D}{filename}.c dfile=${D}{filename}.d cat > ${D}file <<EOT #include "${D}header" EOT # using -MF icc complains about differing command lines in creation/use ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o fi exit ${D}{?} fi EOF dnl ===================== bk-make-pch ends here ===================== ]) --- NEW FILE: bakefile-lang.m4 --- dnl dnl This file is part of Bakefile (http://www.bakefile.org) dnl dnl Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), dnl to deal in the Software without restriction, including without limitation dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, dnl and/or sell copies of the Software, and to permit persons to whom the dnl Software is furnished to do so, subject to the following conditions: dnl dnl The above copyright notice and this permission notice shall be included in dnl all copies or substantial portions of the Software. dnl dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER dnl DEALINGS IN THE SOFTWARE. dnl dnl $Id: bakefile-lang.m4,v 1.1 2008/01/10 00:25:16 jrl1 Exp $ 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], [ AC_LANG_PUSH($2) AC_CACHE_CHECK( [whether we are using the $1 $2 compiler], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3], [AC_TRY_COMPILE( [], [ #ifndef $3 choke me #endif ], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes], [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no] ) ] ) AC_LANG_POP($2) if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then :; $4 else :; $5 fi ]) dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION dnl dnl NB: old versions define _COMPILER_VERSION but this could probably be dnl defined by other compilers too so don't test for it to be safe AC_DEFUN([AC_BAKEFILE_PROG_SGICC], [ _AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes) ]) AC_DEFUN([AC_BAKEFILE_PROG_SGICXX], [ _AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes) ]) dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC AC_DEFUN([AC_BAKEFILE_PROG_SUNCC], [ _AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes) ]) AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX], [ _AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes) ]) dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++ AC_DEFUN([AC_BAKEFILE_PROG_INTELCC], [ _AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes) ]) AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX], [ _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes) ]) dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef AC_DEFUN([AC_BAKEFILE_PROG_HPCC], [ _AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes) ]) AC_DEFUN([AC_BAKEFILE_PROG_HPCXX], [ _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes) ]) dnl Tru64 cc and cxx AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC], [ _AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes) ]) AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX], [ _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes) ]) dnl =========================================================================== dnl macros to detect specialty compiler options dnl =========================================================================== dnl Figure out if we need to pass -ext o to compiler (MetroWerks) AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO], [AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto, dnl First create an empty conf test [AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) dnl Now remove .o and .c.o or .cc.o rm -f conftest.$ac_objext conftest.$ac_ext.o dnl Now compile the test AS_IF([AC_TRY_EVAL(ac_compile)], dnl If the test succeeded look for conftest.c.o or conftest.cc.o [for ac_file in `(ls conftest.* 2>/dev/null)`; do case $ac_file in conftest.$ac_ext.o) bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o" ;; *) ;; esac done], [AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile]) ]) dnl AS_IF rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext ]) dnl AC_CACHE_CHECK if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then if test "[]_AC_LANG_ABBREV[]" = "c"; then CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS" fi if test "[]_AC_LANG_ABBREV[]" = "cxx"; then CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS" fi fi ]) dnl AC_DEFUN dnl =========================================================================== dnl Macros to do all of the compiler detections as one macro dnl =========================================================================== dnl check for different proprietary compilers depending on target platform dnl _AC_BAKEFILE_PROG_COMPILER(LANG) AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER], [ AC_PROG_$1 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 if test "x$1" = "xC"; then AC_BAKEFILE_METROWERKS_EXTO if test "x$bakefile_cv_c_exto" '!=' "x"; then unset ac_cv_prog_cc_g _AC_PROG_CC_G fi fi dnl most of these compilers are only used under well-defined OS so dnl don't waste time checking for them on other ones case `uname -s` in AIX*) AC_BAKEFILE_PROG_XL$1 ;; Darwin) AC_BAKEFILE_PROG_MW$1 AC_BAKEFILE_PROG_XL$1 ;; IRIX*) AC_BAKEFILE_PROG_SGI$1 ;; HP-UX*) AC_BAKEFILE_PROG_HP$1 ;; OSF1) AC_BAKEFILE_PROG_COMPAQ$1 ;; SunOS) AC_BAKEFILE_PROG_SUN$1 ;; esac fi ]) AC_DEFUN([AC_BAKEFILE_PROG_CC], [ _AC_BAKEFILE_PROG_COMPILER(CC) ]) AC_DEFUN([AC_BAKEFILE_PROG_CXX], [ _AC_BAKEFILE_PROG_COMPILER(CXX) ]) --- NEW FILE: bakefile-dllar.m4 --- AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH], [ dnl ===================== dllar.sh begins here ===================== dnl (Created by merge-scripts.py from dllar.sh dnl file do not edit here!) D='$' cat <<EOF >dllar.sh #!/bin/sh # # dllar - a tool to build both a .dll and an .a file # from a set of object (.o) files for EMX/OS2. # # Written by Andrew Zabolotny, bi...@fr... # Ported to Unix like shell by Stefan Neis, Ste...@t-... # # This script will accept a set of files on the command line. # All the public symbols from the .o files will be exported into # a .DEF file, then linker will be run (through gcc) against them to # build a shared library consisting of all given .o files. All libraries # (.a) will be first decompressed into component .o files then act as # described above. You can optionally give a description (-d "description") # which will be put into .DLL. To see the list of accepted options (as well # as command-line format) simply run this program without options. The .DLL # is built to be imported by name (there is no guarantee that new versions # of the library you build will have same ordinals for same symbols). # # dllar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # dllar is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with dllar; see the file COPYING. If not, write to the Free # Software Foundation, 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # To successfuly run this program you will need: # - Current drive should have LFN support (HPFS, ext2, network, etc) # (Sometimes dllar generates filenames which won't fit 8.3 scheme) # - gcc # (used to build the .dll) # - emxexp # (used to create .def file from .o files) # - emximp # (used to create .a file from .def file) # - GNU text utilites (cat, sort, uniq) # used to process emxexp output # - GNU file utilities (mv, rm) # - GNU sed # - lxlite (optional, see flag below) # (used for general .dll cleanup) # flag_USE_LXLITE=1; # # helper functions # basnam, variant of basename, which does _not_ remove the path, _iff_ # second argument (suffix to remove) is given basnam(){ case ${D}# in 1) echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//' ;; 2) echo ${D}1 | sed 's/'${D}2'${D}//' ;; *) echo "error in basnam ${D}*" exit 8 ;; esac } # Cleanup temporary files and output CleanUp() { cd ${D}curDir for i in ${D}inputFiles ; do case ${D}i in *!) rm -rf \`basnam ${D}i !\` ;; *) ;; esac done # Kill result in case of failure as there is just to many stupid make/nmake # things out there which doesn't do this. if @<:@ ${D}# -eq 0 @:>@; then rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile fi } # Print usage and exit script with rc=1. PrintHelp() { echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@' echo ' @<:@-name-mangler-script script.sh@:>@' echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@' echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"' echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@' echo ' @<:@*.o@:>@ @<:@*.a@:>@' echo '*> "output_file" should have no extension.' echo ' If it has the .o, .a or .dll extension, it is automatically removed.' echo ' The import library name is derived from this and is set to "name".a,' echo ' unless overridden by -import' echo '*> "importlib_name" should have no extension.' echo ' If it has the .o, or .a extension, it is automatically removed.' echo ' This name is used as the import library name and may be longer and' echo ' more descriptive than the DLL name which has to follow the old ' echo ' 8.3 convention of FAT.' echo '*> "script.sh may be given to override the output_file name by a' echo ' different name. It is mainly useful if the regular make process' echo ' of some package does not take into account OS/2 restriction of' echo ' DLL name lengths. It takes the importlib name as input and is' echo ' supposed to procude a shorter name as output. The script should' echo ' expect to get importlib_name without extension and should produce' echo ' a (max.) 8 letter name without extension.' echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)' echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)' echo ' These flags will be put at the start of GCC command line.' echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.' echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define' echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".' echo ' If the last character of a symbol is "*", all symbols beginning' echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).' echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or' echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.' echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s' echo ' C runtime DLLs.' echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.' echo '*> All other switches (for example -L./ or -lmylib) will be passed' echo ' unchanged to GCC at the end of command line.' echo '*> If you create a DLL from a library and you do not specify -o,' echo ' the basename for DLL and import library will be set to library name,' echo ' the initial library will be renamed to 'name'_s.a (_s for static)' echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial' echo ' library will be renamed into gcc_s.a.' echo '--------' echo 'Example:' echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord' echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"' CleanUp exit 1 } # Execute a command. # If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script. # @Uses Whatever CleanUp() uses. doCommand() { echo "${D}*" eval ${D}* rcCmd=${D}? if @<:@ ${D}rcCmd -ne 0 @:>@; then echo "command failed, exit code="${D}rcCmd CleanUp exit ${D}rcCmd fi } # main routine # setup globals cmdLine=${D}* outFile="" outimpFile="" inputFiles="" renameScript="" description="" CC=gcc.exe CFLAGS="-s -Zcrtdll" EXTRA_CFLAGS="" EXPORT_BY_ORDINALS=0 exclude_symbols="" library_flags="" curDir=\`pwd\` curDirS=curDir case ${D}curDirS in */) ;; *) curDirS=${D}{curDirS}"/" ;; esac # Parse commandline libsToLink=0 omfLinking=0 while @<:@ ${D}1 @:>@; do case ${D}1 in -ord*) EXPORT_BY_ORDINALS=1; ;; -o*) shift outFile=${D}1 ;; -i*) shift outimpFile=${D}1 ;; -name-mangler-script) shift renameScript=${D}1 ;; -d*) shift description=${D}1 ;; -f*) shift CFLAGS=${D}1 ;; -c*) shift CC=${D}1 ;; -h*) PrintHelp ;; -ex*) shift exclude_symbols=${D}{exclude_symbols}${D}1" " ;; -libf*) shift library_flags=${D}{library_flags}${D}1" " ;; -nocrt*) CFLAGS="-s" ;; -nolxl*) flag_USE_LXLITE=0 ;; -* | /*) case ${D}1 in -L* | -l*) libsToLink=1 ;; -Zomf) omfLinking=1 ;; *) ;; esac EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 ;; *.dll) EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`" if @<:@ ${D}omfLinking -eq 1 @:>@; then EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib" else EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a" fi ;; *) found=0; if @<:@ ${D}libsToLink -ne 0 @:>@; then EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1 else for file in ${D}1 ; do if @<:@ -f ${D}file @:>@; then inputFiles="${D}{inputFiles} ${D}file" found=1 fi done if @<:@ ${D}found -eq 0 @:>@; then echo "ERROR: No file(s) found: "${D}1 exit 8 fi fi ;; esac shift done # iterate cmdline words # if @<:@ -z "${D}inputFiles" @:>@; then echo "dllar: no input files" PrintHelp fi # Now extract all .o files from .a files newInputFiles="" for file in ${D}inputFiles ; do case ${D}file in *.a | *.lib) case ${D}file in *.a) suffix=".a" AR="ar" ;; *.lib) suffix=".lib" AR="emxomfar" EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf" ;; *) ;; esac dirname=\`basnam ${D}file ${D}suffix\`"_%" mkdir ${D}dirname if @<:@ ${D}? -ne 0 @:>@; then echo "Failed to create subdirectory ./${D}dirname" CleanUp exit 8; fi # Append '!' to indicate archive newInputFiles="${D}newInputFiles ${D}{dirname}!" doCommand "cd ${D}dirname; ${D}AR x ../${D}file" cd ${D}curDir found=0; for subfile in ${D}dirname/*.o* ; do if @<:@ -f ${D}subfile @:>@; then found=1 if @<:@ -s ${D}subfile @:>@; then # FIXME: This should be: is file size > 32 byte, _not_ > 0! newInputFiles="${D}newInputFiles ${D}subfile" fi fi done if @<:@ ${D}found -eq 0 @:>@; then echo "WARNING: there are no files in archive \\'${D}file\\'" fi ;; *) newInputFiles="${D}{newInputFiles} ${D}file" ;; esac done inputFiles="${D}newInputFiles" # Output filename(s). do_backup=0; if @<:@ -z ${D}outFile @:>@; then do_backup=1; set outFile ${D}inputFiles; outFile=${D}2 fi # If it is an archive, remove the '!' and the '_%' suffixes case ${D}outFile in *_%!) outFile=\`basnam ${D}outFile _%!\` ;; *) ;; esac case ${D}outFile in *.dll) outFile=\`basnam ${D}outFile .dll\` ;; *.DLL) outFile=\`basnam ${D}outFile .DLL\` ;; *.o) outFile=\`basnam ${D}outFile .o\` ;; *.obj) outFile=\`basnam ${D}outFile .obj\` ;; *.a) outFile=\`basnam ${D}outFile .a\` ;; *.lib) outFile=\`basnam ${D}outFile .lib\` ;; *) ;; esac case ${D}outimpFile in *.a) outimpFile=\`basnam ${D}outimpFile .a\` ;; *.lib) outimpFile=\`basnam ${D}outimpFile .lib\` ;; *) ;; esac if @<:@ -z ${D}outimpFile @:>@; then outimpFile=${D}outFile fi defFile="${D}{outFile}.def" arcFile="${D}{outimpFile}.a" arcFile2="${D}{outimpFile}.lib" #create ${D}dllFile as something matching 8.3 restrictions, if @<:@ -z ${D}renameScript @:>@ ; then dllFile="${D}outFile" else dllFile=\`${D}renameScript ${D}outimpFile\` fi if @<:@ ${D}do_backup -ne 0 @:>@ ; then if @<:@ -f ${D}arcFile @:>@ ; then doCommand "mv ${D}arcFile ${D}{outFile}_s.a" fi if @<:@ -f ${D}arcFile2 @:>@ ; then doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib" fi fi # Extract public symbols from all the object files. tmpdefFile=${D}{defFile}_% rm -f ${D}tmpdefFile for file in ${D}inputFiles ; do case ${D}file in *!) ;; *) doCommand "emxexp -u ${D}file >> ${D}tmpdefFile" ;; esac done # Create the def file. rm -f ${D}defFile echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile dllFile="${D}{dllFile}.dll" if @<:@ ! -z ${D}description @:>@; then echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile fi echo "EXPORTS" >> ${D}defFile doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%" grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile # Checks if the export is ok or not. for word in ${D}exclude_symbols; do grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}% mv ${D}{tmpdefFile}% ${D}tmpdefFile done if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then sed "=" < ${D}tmpdefFile | \\ sed ' N : loop s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/ t loop ' > ${D}{tmpdefFile}% grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile else rm -f ${D}{tmpdefFile}% fi cat ${D}tmpdefFile >> ${D}defFile rm -f ${D}tmpdefFile # Do linking, create implib, and apply lxlite. gccCmdl=""; for file in ${D}inputFiles ; do case ${D}file in *!) ;; *) gccCmdl="${D}gccCmdl ${D}file" ;; esac done doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS" touch "${D}{outFile}.dll" doCommand "emximp -o ${D}arcFile ${D}defFile" if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then add_flags=""; if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then add_flags="-ynd" fi doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile" fi doCommand "emxomf -s -l ${D}arcFile" # Successful exit. CleanUp 1 exit 0 EOF dnl ===================== dllar.sh ends here ===================== ]) |
|
From: John L. <jr...@us...> - 2008-01-10 00:06:57
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10938/autoconf Modified Files: acregen.sh Log Message: Fix for aclocal version of 1.10 instead of 1.10.0 Index: acregen.sh =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** acregen.sh 27 Jul 2007 14:11:59 -0000 1.5 --- acregen.sh 10 Jan 2008 00:06:53 -0000 1.6 *************** *** 1,3 **** ! #!/bin/bash # # Author: Francesco Montorsi --- 1,3 ---- ! #!/bin/bash # # Author: Francesco Montorsi *************** *** 36,52 **** aclocal_rel=`echo $aclocal_verfull | sed 's/aclocal (GNU automake) \([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'` aclocal_minimal_maj=1 aclocal_minimal_min=9 aclocal_minimal_rel=6 ! majok=$(expr $aclocal_maj \>= $aclocal_minimal_maj) ! minok=$(expr $aclocal_min \>= $aclocal_minimal_min) ! relok=$(expr $aclocal_rel \>= $aclocal_minimal_rel) ! ! if [[ "$majok" = "0" ]]; then aclocalold; fi ! if [[ "$majok" = "1" && "$minok" = "0" ]]; then aclocalold; fi ! if [[ "$majok" = "1" && "$minok" = "1" && "$relok" = 0 ]]; then aclocalold; fi ! --- 36,53 ---- aclocal_rel=`echo $aclocal_verfull | sed 's/aclocal (GNU automake) \([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'` + # the version may only be 1.10 instead of 1.10.0 + if [[ "x$aclocal_rel" = "x" ]]; then aclocal_rel=0; fi + aclocal_minimal_maj=1 aclocal_minimal_min=9 aclocal_minimal_rel=6 ! majok=$(expr $aclocal_maj \- $aclocal_minimal_maj) ! minok=$(expr $aclocal_min \- $aclocal_minimal_min) ! relok=$(expr $aclocal_rel \- $aclocal_minimal_rel) + if [[ $majok < 0 ]]; then aclocalold; fi + if [[ $majok = 0 && $minok < 0 ]]; then aclocalold; fi + if [[ $majok = 0 && $minok = 0 && $relok < 0 ]]; then aclocalold; fi *************** *** 59,68 **** autoconf_minimal_min=60 ! majok=$(expr $autoconf_maj \>= $autoconf_minimal_maj) ! minok=$(expr $autoconf_min \>= $autoconf_minimal_min) ! ! if [[ "$majok" = "0" ]]; then autoconfold; fi ! if [[ "$majok" = "1" && "$minok" = "0" ]]; then autoconfold; fi --- 60,68 ---- autoconf_minimal_min=60 ! majok=$(expr $autoconf_maj \- $autoconf_minimal_maj) ! minok=$(expr $autoconf_min \- $autoconf_minimal_min) + if [[ $majok < 0 ]]; then autoconfold; fi + if [[ $majok = 0 && $minok < 0 ]]; then autoconfold; fi |
|
From: John L. <jr...@us...> - 2008-01-09 05:47:29
|
Update of /cvsroot/wxlua/wxLua/build In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1663/wxLua/build Modified Files: Makefile_wx-config.in Makefile_wx-config_targets.in Log Message: Add simple check for Lua's Makefile to work in Linux and OSX Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile_wx-config.in 22 Jul 2007 04:38:28 -0000 1.3 --- Makefile_wx-config.in 9 Jan 2008 05:47:26 -0000 1.4 *************** *** 37,40 **** --- 37,49 ---- endif + # Lua PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_PLAT=linux + + ifeq (Apple, $(findstring Apple, $(shell gcc --version))) + LUA_PLAT=macosx + endif + + # --- wxWidgets parameters from wx-config ------------------------------------ Index: Makefile_wx-config_targets.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config_targets.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile_wx-config_targets.in 16 Jul 2007 19:34:28 -0000 1.2 --- Makefile_wx-config_targets.in 9 Jan 2008 05:47:26 -0000 1.3 *************** *** 11,15 **** Lua: ! @(cd $(WXLUA_DIR)/modules/lua && make linux) wxLuaLib: --- 11,15 ---- Lua: ! @(cd $(WXLUA_DIR)/modules/lua && make $(LUA_PLAT)) wxLuaLib: |
|
From: John L. <jr...@us...> - 2008-01-09 05:03:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16893/wxLua/modules/wxbind/src Modified Files: wxgl_gl.cpp Log Message: Update for OSX since wxGLXXX doesn't match MSW or GTK Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxgl_gl.cpp 22 Dec 2007 06:07:14 -0000 1.6 --- wxgl_gl.cpp 9 Jan 2008 05:02:53 -0000 1.7 *************** *** 62,70 **** ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent1[1] = {{ wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }}; ! // %wxchkver_2_8 void SetCurrent(const wxGLContext& RC) const static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L) { --- 62,70 ---- ! #if ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent1[1] = {{ wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }}; ! // %wxchkver_2_8&!%mac void SetCurrent(const wxGLContext& RC) const static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L) { *************** *** 79,88 **** } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent[1] = {{ wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }}; ! // void SetCurrent() static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) { --- 79,89 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) + #if (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent[1] = {{ wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }}; ! // %mac void SetCurrent() static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) { *************** *** 95,98 **** --- 96,101 ---- } + #endif // (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) + static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SwapBuffers[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SwapBuffers(lua_State *L); *************** *** 110,118 **** ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor3[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TTABLE, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) { --- 113,121 ---- ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor3[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TTABLE, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }}; ! // !%mac wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) { *************** *** 145,148 **** --- 148,154 ---- } + #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) + + #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor2[] = { &g_wxluatype_wxWindow, &g_wxluatype_wxGLCanvas, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_TTABLE, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); *************** *** 255,280 **** ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload[] = { ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }, ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }, }; static int s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) --- 261,289 ---- ! #if (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload[] = { ! #if ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! ! #if (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }, + #endif // (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) *************** *** 292,296 **** static int s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // Map Lua Class Methods to C Binding Functions --- 301,305 ---- static int s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // Map Lua Class Methods to C Binding Functions *************** *** 299,311 **** { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetColour, 1, NULL }, ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { "SwapBuffers", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SwapBuffers, 1, NULL }, ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { "wxGLCanvas", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { 0, 0, 0, 0 }, --- 308,320 ---- { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetColour, 1, NULL }, ! #if (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count, 0 }, ! #endif // (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SwapBuffers", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SwapBuffers, 1, NULL }, ! #if ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { "wxGLCanvas", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { 0, 0, 0, 0 }, *************** *** 358,365 **** } static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1[] = { &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent1[1] = {{ wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }}; ! // void SetCurrent() static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L) { --- 367,391 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2[] = { &g_wxluatype_wxGLContext, NULL }; + static int LUACALL wxLua_wxGLContext_SetCurrent2(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent2[1] = {{ wxLua_wxGLContext_SetCurrent2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2 }}; + // void SetCurrent() + static int LUACALL wxLua_wxGLContext_SetCurrent2(lua_State *L) + { + // get this + wxGLContext * self = (wxGLContext *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGLContext); + // call SetCurrent + self->SetCurrent(); + + return 0; + } + + #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) + + #if (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1[] = { &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent1[1] = {{ wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }}; ! // %mac void SetCurrent() const static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L) { *************** *** 372,382 **** } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent[] = { &g_wxluatype_wxGLContext, &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent[1] = {{ wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }}; ! // void SetCurrent(const wxGLCanvas& win) const static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { --- 398,408 ---- } ! #endif // (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent[] = { &g_wxluatype_wxGLContext, &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent[1] = {{ wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }}; ! // !%mac void SetCurrent(const wxGLCanvas& win) const static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { *************** *** 391,395 **** } ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) --- 417,421 ---- } ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) *************** *** 463,471 **** #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor[1] = {{ wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }}; ! // wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { --- 489,497 ---- #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor[1] = {{ wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }}; ! // !%mac wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) // FIXME static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { *************** *** 486,494 **** } ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload[] = --- 512,520 ---- } ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload[] = *************** *** 496,511 **** #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! { wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor_overload[] = --- 522,541 ---- #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! { wxLua_wxGLContext_SetCurrent2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2 }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! { wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }, ! #endif // (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }, ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor_overload[] = *************** *** 520,530 **** #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // Map Lua Class Methods to C Binding Functions --- 550,560 ---- #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }, ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // Map Lua Class Methods to C Binding Functions *************** *** 535,541 **** #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) --- 565,571 ---- #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) *************** *** 543,549 **** #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "wxGLContext", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLContext_constructor_overload, s_wxluafunc_wxLua_wxGLContext_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { 0, 0, 0, 0 }, --- 573,579 ---- #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "wxGLContext", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLContext_constructor_overload, s_wxluafunc_wxLua_wxGLContext_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { 0, 0, 0, 0 }, |
|
From: John L. <jr...@us...> - 2008-01-09 05:00:55
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16085/wxwidgets Modified Files: wxgl_gl.i Log Message: Update for OSX since its wxGLXXX doesn't match MSW's or GTK's Index: wxgl_gl.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxgl_gl.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxgl_gl.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxgl_gl.i 9 Jan 2008 05:00:49 -0000 1.2 *************** *** 42,50 **** wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) wxGLContext* GetContext() const ! void SetCurrent() ! %wxchkver_2_8 void SetCurrent(const wxGLContext& RC) const void SetColour(const wxString& colour) void SwapBuffers() --- 42,50 ---- wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! !%mac wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) wxGLContext* GetContext() const ! %mac void SetCurrent() ! %wxchkver_2_8&!%mac void SetCurrent(const wxGLContext& RC) const void SetColour(const wxString& colour) void SwapBuffers() *************** *** 57,63 **** %if %wxchkver_2_8 ! wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) ! void SetCurrent(const wxGLCanvas& win) const %endif // %wxchkver_2_8 --- 57,64 ---- %if %wxchkver_2_8 ! !%mac wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) // FIXME ! !%mac void SetCurrent(const wxGLCanvas& win) const ! %mac void SetCurrent() const %endif // %wxchkver_2_8 |
|
From: John L. <jr...@us...> - 2008-01-09 05:00:07
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13740/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Regenerate bakefiles using frm_bakefile 1995295 bytes No changes to the bakefiles and these changes appear to only alphabetize files Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.vc 1 Aug 2007 10:08:22 -0000 1.72 --- makefile.vc 9 Jan 2008 04:59:57 -0000 1.73 *************** *** 123,128 **** $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ --- 123,128 ---- $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ *************** *** 144,152 **** /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ --- 144,152 ---- /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ *************** *** 565,572 **** $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 565,572 ---- $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 583,593 **** 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 $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 583,590 ---- 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 $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 595,599 **** $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 592,599 ---- $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.bcc 1 Aug 2007 10:08:22 -0000 1.72 --- makefile.bcc 9 Jan 2008 04:59:57 -0000 1.73 *************** *** 169,174 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 169,174 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 187,195 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 187,195 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 581,588 **** $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 581,588 ---- $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 599,609 **** 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$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 599,606 ---- 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$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 611,615 **** $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 608,615 ---- $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.wat 1 Aug 2007 10:08:22 -0000 1.73 --- makefile.wat 9 Jan 2008 04:59:57 -0000 1.74 *************** *** 589,594 **** $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 589,594 ---- $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 608,616 **** -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 608,616 ---- -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 771,778 **** $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< --- 771,778 ---- $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< *************** *** 789,799 **** 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=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< - 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_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.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) $< --- 789,796 ---- 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=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< *************** *** 801,805 **** $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< --- 798,805 ---- $(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) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.gcc 1 Aug 2007 10:08:22 -0000 1.72 --- makefile.gcc 9 Jan 2008 04:59:57 -0000 1.73 *************** *** 109,114 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 109,114 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 129,137 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 129,137 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 658,665 **** $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< --- 658,665 ---- $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< *************** *** 676,686 **** 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 $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp - $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 676,683 ---- 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 $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< *************** *** 688,692 **** $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 685,692 ---- $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< |
|
From: John L. <jr...@us...> - 2008-01-09 05:00:05
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13740/wxLua/modules Modified Files: Makefile.in Log Message: Regenerate bakefiles using frm_bakefile 1995295 bytes No changes to the bakefiles and these changes appear to only alphabetize files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Makefile.in 1 Aug 2007 10:08:23 -0000 1.62 --- Makefile.in 9 Jan 2008 04:59:57 -0000 1.63 *************** *** 125,134 **** $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! wxlua_lib_wxlua.o \ ! wxlua_lib_wxlcallb.o \ wxlua_lib_wxlbind.o \ wxlua_lib_wxlstate.o \ ! wxlua_lib_wxlua_bind.o \ ! wxlua_lib_dummy.o WXLUA_LIB_ODEP = $(___pch_wxprec_wxlua_lib_wx_wxprec_h_gch___depname) WXLUA_DLL_CXXFLAGS = $(__wxlua_dll_PCH_INC) \ [...1467 lines suppressed...] wxluasocket_dll_dummy.o: $(srcdir)/wxluasocket/src/dummy.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/dummy.cpp + wxluasocket_dll_wxldserv.o: $(srcdir)/wxluasocket/src/wxldserv.cpp $(WXLUASOCKET_DLL_ODEP) + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldserv.cpp + wxluasocket_dll_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp ! wxluasocket_dll_wxlsock.o: $(srcdir)/wxluasocket/src/wxlsock.cpp $(WXLUASOCKET_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp wxluasocket_dll_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp + wxluasocket_dll_wxluasocket_bind.o: $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp $(WXLUASOCKET_DLL_ODEP) + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp + mod_luamodule_luamodule.o: $(srcdir)/luamodule/src/luamodule.cpp $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp |
|
From: John L. <jr...@us...> - 2008-01-09 05:00:05
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13740/wxLua Modified Files: Makefile.in Log Message: Regenerate bakefiles using frm_bakefile 1995295 bytes No changes to the bakefiles and these changes appear to only alphabetize files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile.in 1 Aug 2007 10:08:22 -0000 1.29 --- Makefile.in 9 Jan 2008 04:59:57 -0000 1.30 *************** *** 79,83 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/validator.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/settings.wx.lua samples/picker.wx.lua samples/choices.wx.lua samples/media.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/controls.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/bindings.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 79,83 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/auidemo.wx.lua samples/bindings.wx.lua samples/calculator.wx.lua samples/choices.wx.lua samples/controls.wx.lua samples/coroutine.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/media.wx.lua samples/minimal.wx.lua samples/picker.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/settings.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/validator.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
