Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:46
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/util/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.vc 20 Jun 2005 09:48:55 -0000 1.3 --- makefile.vc 20 Nov 2005 11:35:18 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 32,35 **** --- 32,38 ---- WX_DEBUG = 1 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 20 Jun 2005 09:48:39 -0000 1.3 --- makefile.bcc 20 Nov 2005 11:35:18 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 55,58 **** --- 55,63 ---- !endif + # Use monolithic build of wxWidgets? [0,1] + !ifndef WX_MONOLITHIC + WX_MONOLITHIC = 0 + !endif + # Does the wxLua utilities should be compiled ? [0,1] !ifndef USE_BIN2C Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.wat 20 Jun 2005 09:48:55 -0000 1.3 --- makefile.wat 20 Nov 2005 11:35:18 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 32,35 **** --- 32,38 ---- WX_DEBUG = 1 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 100,103 **** watcom\util_bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $< --- 103,106 ---- watcom\util_bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -bt=nt -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.gcc 20 Jun 2005 09:48:55 -0000 1.3 --- makefile.gcc 20 Nov 2005 11:35:18 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 32,35 **** --- 32,38 ---- WX_DEBUG = 1 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 43,46 **** --- 46,50 ---- ### Variables: ### + CPPDEPS = -MT$@ -MF$@.d -MD UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ *************** *** 64,67 **** --- 68,72 ---- clean: -if exist mingw\*.o del mingw\*.o + -if exist mingw\*.d del mingw\*.d -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe *************** *** 72,78 **** mingw\util_bin2c_bin2c.o: ../../bin2c/bin2c.c ! $(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $< .PHONY: all clean --- 77,85 ---- mingw\util_bin2c_bin2c.o: ../../bin2c/bin2c.c ! $(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $(CPPDEPS) $< .PHONY: all clean + # Dependencies tracking: + -include mingw/*.d |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:46
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 20 Jun 2005 09:48:37 -0000 1.5 --- makefile.vc 20 Nov 2005 11:35:18 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 44,47 **** --- 44,50 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + *************** *** 246,250 **** !if "$(WX_DEBUG)" == "1" ! WX3RDPARTLIBPOSTFIX = d !endif !if "$(WX_SHARED)" == "0" --- 249,253 ---- !if "$(WX_DEBUG)" == "1" ! WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_SHARED)" == "0" *************** *** 284,287 **** --- 287,350 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE *************** *** 385,389 **** ..\..\..\lib\vc_lib\lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ ! lib /NOLOGO /OUT:$@ @<< $(MOD_LUA_LIB_OBJECTS) << --- 448,452 ---- ..\..\..\lib\vc_lib\lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ ! link /LIB /NOLOGO /OUT:$@ @<< $(MOD_LUA_LIB_OBJECTS) << *************** *** 397,401 **** ..\..\..\lib\vc_lib\wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ ! lib /NOLOGO /OUT:$@ @<< $(WXLUA_LIB_OBJECTS) << --- 460,464 ---- ..\..\..\lib\vc_lib\wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ ! link /LIB /NOLOGO /OUT:$@ @<< $(WXLUA_LIB_OBJECTS) << *************** *** 405,409 **** ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << !endif --- 468,472 ---- ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_DLL_OBJECTS) $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << !endif *************** *** 412,416 **** ..\..\..\lib\vc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ ! lib /NOLOGO /OUT:$@ @<< $(WXBIND_LIB_OBJECTS) << --- 475,479 ---- ..\..\..\lib\vc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ ! link /LIB /NOLOGO /OUT:$@ @<< $(WXBIND_LIB_OBJECTS) << *************** *** 420,424 **** ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBIND_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib << !endif --- 483,487 ---- ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBIND_DLL_OBJECTS) $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib << !endif *************** *** 427,431 **** ..\..\..\lib\vc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ ! lib /NOLOGO /OUT:$@ @<< $(WXLUADEBUG_LIB_OBJECTS) << --- 490,494 ---- ..\..\..\lib\vc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ ! link /LIB /NOLOGO /OUT:$@ @<< $(WXLUADEBUG_LIB_OBJECTS) << *************** *** 435,439 **** ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUADEBUG_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << !endif --- 498,502 ---- ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUADEBUG_DLL_OBJECTS) $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << !endif *************** *** 442,446 **** ..\..\..\lib\vc_lib\wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ ! lib /NOLOGO /OUT:$@ @<< $(WXLUASOCKET_LIB_OBJECTS) << --- 505,509 ---- ..\..\..\lib\vc_lib\wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ ! link /LIB /NOLOGO /OUT:$@ @<< $(WXLUASOCKET_LIB_OBJECTS) << *************** *** 450,454 **** ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUASOCKET_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << !endif --- 513,517 ---- ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUASOCKET_DLL_OBJECTS) $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.bcc 20 Jun 2005 09:48:36 -0000 1.7 --- makefile.bcc 20 Nov 2005 11:35:18 -0000 1.8 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 75,78 **** --- 75,83 ---- !endif + # Use monolithic build of wxWidgets? [0,1] + !ifndef WX_MONOLITHIC + WX_MONOLITHIC = 0 + !endif + *************** *** 266,270 **** !if "$(WX_DEBUG)" == "1" ! WX3RDPARTLIBPOSTFIX = d !endif !if "$(WX_SHARED)" == "0" --- 271,275 ---- !if "$(WX_DEBUG)" == "1" ! WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_SHARED)" == "0" *************** *** 298,301 **** --- 303,366 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 416,420 **** ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua $@ --- 481,485 ---- ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua $@ *************** *** 432,436 **** ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxbind $@ --- 497,501 ---- ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxbind $@ *************** *** 448,452 **** ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxluadebug $@ --- 513,517 ---- ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxluadebug $@ *************** *** 464,468 **** ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxluasocket $@ --- 529,533 ---- ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | implib -f ..\..\..\lib\bcc_dll\wxluasocket $@ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.wat 20 Jun 2005 09:48:37 -0000 1.5 --- makefile.wat 20 Nov 2005 11:35:18 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! [...964 lines suppressed...] ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj : .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj : .AUTODEPEND ..\..\wxluasocket\src\socket.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj : .AUTODEPEND ..\..\wxluasocket\src\debugio.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj : .AUTODEPEND ..\..\wxluasocket\src\dserver.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj : .AUTODEPEND ..\..\wxluasocket\src\dtarget.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj : .AUTODEPEND ..\..\wxluasocket\src\socket.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.gcc 20 Jun 2005 09:48:37 -0000 1.7 --- makefile.gcc 20 Nov 2005 11:35:18 -0000 1.8 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 44,47 **** --- 44,50 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + *************** *** 52,55 **** --- 55,59 ---- ### Variables: ### + CPPDEPS = -MT$@ -MF$@.d -MD MOD_LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ *************** *** 238,242 **** ifeq ($(WX_DEBUG),1) ! WX3RDPARTLIBPOSTFIX = d endif ifeq ($(WX_SHARED),0) --- 242,246 ---- ifeq ($(WX_DEBUG),1) ! WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_SHARED),0) *************** *** 270,273 **** --- 274,417 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv + endif + endif + endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 330,333 **** --- 474,478 ---- clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o + -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d -if exist ..\..\..\lib\gcc_lib\liblua.a del ..\..\..\lib\gcc_lib\liblua.a -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe *************** *** 368,372 **** ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 513,517 ---- ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua.a $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 380,384 **** ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxbind.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 525,529 ---- ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxbind.a $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 392,396 **** ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluadebug.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 537,541 ---- ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluadebug.a $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 404,777 **** ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluasocket.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o: ../../lua/src/lapi.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lcode.o: ../../lua/src/lcode.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.o: ../../lua/src/ldebug.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o: ../../lua/src/ldllmain.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o: ../../lua/src/ldo.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldump.o: ../../lua/src/ldump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.o: ../../lua/src/lfunc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lgc.o: ../../lua/src/lgc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_llex.o: ../../lua/src/llex.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmem.o: ../../lua/src/lmem.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lobject.o: ../../lua/src/lobject.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.o: ../../lua/src/lopcodes.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lparser.o: ../../lua/src/lparser.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstate.o: ../../lua/src/lstate.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstring.o: ../../lua/src/lstring.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltable.o: ../../lua/src/ltable.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltests.o: ../../lua/src/ltests.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltm.o: ../../lua/src/ltm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o: ../../lua/src/lundump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lvm.o: ../../lua/src/lvm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lzio.o: ../../lua/src/lzio.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.o: ../../lua/src/lib/lbaselib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.o: ../../lua/src/lib/ldblib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o: ../../lua/src/lib/liolib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.o: ../../lua/src/lib/lmathlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.o: ../../lua/src/lib/loadlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o: ../../lua/src/lib/lstrlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.o: ../../lua/src/lib/ltablib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lua.o: ../../lua/src/lua/lua.c ! $(CC) -c -o $@ $(MOD_LUA_CFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o: ../../wxlua/src/internal.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_interp.o: ../../wxlua/src/interp.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_library.o: ../../wxlua/src/library.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o: ../../wxlua/src/internal.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o: ../../wxlua/src/interp.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o: ../../wxlua/src/library.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_appframe.o: ../../wxbind/src/appframe.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.o: ../../wxbind/src/clipdrag.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_config.o: ../../wxbind/src/config.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_controls.o: ../../wxbind/src/controls.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_data.o: ../../wxbind/src/data.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_datetime.o: ../../wxbind/src/datetime.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_defsutil.o: ../../wxbind/src/defsutil.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_dialogs.o: ../../wxbind/src/dialogs.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_event.o: ../../wxbind/src/event.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_file.o: ../../wxbind/src/file.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_fl.o: ../../wxbind/src/fl.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_gdi.o: ../../wxbind/src/gdi.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_geometry.o: ../../wxbind/src/geometry.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o: ../../wxbind/src/grid.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_help.o: ../../wxbind/src/help.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o: ../../wxbind/src/html.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_image.o: ../../wxbind/src/image.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_mdi.o: ../../wxbind/src/mdi.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_menutool.o: ../../wxbind/src/menutool.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_plot.o: ../../wxbind/src/plot.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_print.o: ../../wxbind/src/print.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_regex.o: ../../wxbind/src/regex.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_sizer.o: ../../wxbind/src/sizer.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_socket.o: ../../wxbind/src/socket.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_stc.o: ../../wxbind/src/stc.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_thread.o: ../../wxbind/src/thread.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wave.o: ../../wxbind/src/wave.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_windows.o: ../../wxbind/src/windows.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o: ../../wxbind/src/wxlprint.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlua.o: ../../wxbind/src/wxlua.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o: ../../wxbind/src/wx_class.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_define.o: ../../wxbind/src/wx_define.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_event.o: ../../wxbind/src/wx_event.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_object.o: ../../wxbind/src/wx_object.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_xml.o: ../../wxbind/src/xml.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_appframe.o: ../../wxbind/src/appframe.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.o: ../../wxbind/src/clipdrag.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_config.o: ../../wxbind/src/config.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_controls.o: ../../wxbind/src/controls.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_data.o: ../../wxbind/src/data.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_datetime.o: ../../wxbind/src/datetime.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_defsutil.o: ../../wxbind/src/defsutil.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_dialogs.o: ../../wxbind/src/dialogs.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_event.o: ../../wxbind/src/event.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_file.o: ../../wxbind/src/file.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_fl.o: ../../wxbind/src/fl.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_gdi.o: ../../wxbind/src/gdi.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_geometry.o: ../../wxbind/src/geometry.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o: ../../wxbind/src/grid.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_help.o: ../../wxbind/src/help.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o: ../../wxbind/src/html.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_image.o: ../../wxbind/src/image.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_mdi.o: ../../wxbind/src/mdi.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_menutool.o: ../../wxbind/src/menutool.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_plot.o: ../../wxbind/src/plot.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_print.o: ../../wxbind/src/print.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_regex.o: ../../wxbind/src/regex.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_sizer.o: ../../wxbind/src/sizer.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_socket.o: ../../wxbind/src/socket.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_stc.o: ../../wxbind/src/stc.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_thread.o: ../../wxbind/src/thread.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wave.o: ../../wxbind/src/wave.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_windows.o: ../../wxbind/src/windows.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o: ../../wxbind/src/wxlprint.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlua.o: ../../wxbind/src/wxlua.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_class.o: ../../wxbind/src/wx_class.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_define.o: ../../wxbind/src/wx_define.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_event.o: ../../wxbind/src/wx_event.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_object.o: ../../wxbind/src/wx_object.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_xml.o: ../../wxbind/src/xml.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o: ../../wxluadebug/src/debug.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o: ../../wxluadebug/src/splttree.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o: ../../wxluadebug/src/staktree.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_dll_debug.o: ../../wxluadebug/src/debug.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o: ../../wxluadebug/src/splttree.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o: ../../wxluadebug/src/staktree.cpp ! $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.o: ../../wxluasocket/src/debugio.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o: ../../wxluasocket/src/dserver.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o: ../../wxluasocket/src/dtarget.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o: ../../wxluasocket/src/socket.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.o: ../../wxluasocket/src/debugio.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o: ../../wxluasocket/src/dserver.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o: ../../wxluasocket/src/dtarget.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o: ../../wxluasocket/src/socket.cpp ! $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $< .PHONY: all clean --- 549,924 ---- ifeq ($(WX_SHARED),1) ..\..\..\lib\gcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluasocket.a $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_ADV_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o: ../../lua/src/lapi.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lcode.o: ../../lua/src/lcode.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.o: ../../lua/src/ldebug.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o: ../../lua/src/ldllmain.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o: ../../lua/src/ldo.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldump.o: ../../lua/src/ldump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.o: ../../lua/src/lfunc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lgc.o: ../../lua/src/lgc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_llex.o: ../../lua/src/llex.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmem.o: ../../lua/src/lmem.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lobject.o: ../../lua/src/lobject.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.o: ../../lua/src/lopcodes.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lparser.o: ../../lua/src/lparser.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstate.o: ../../lua/src/lstate.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstring.o: ../../lua/src/lstring.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltable.o: ../../lua/src/ltable.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltests.o: ../../lua/src/ltests.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltm.o: ../../lua/src/ltm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o: ../../lua/src/lundump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lvm.o: ../../lua/src/lvm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lzio.o: ../../lua/src/lzio.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.o: ../../lua/src/lib/lbaselib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.o: ../../lua/src/lib/ldblib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o: ../../lua/src/lib/liolib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.o: ../../lua/src/lib/lmathlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.o: ../../lua/src/lib/loadlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o: ../../lua/src/lib/lstrlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.o: ../../lua/src/lib/ltablib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\mod_lua_lua.o: ../../lua/src/lua/lua.c ! $(CC) -c -o $@ $(MOD_LUA_CFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o: ../../wxlua/src/internal.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_interp.o: ../../wxlua/src/interp.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_library.o: ../../wxlua/src/library.cpp ! $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o: ../../wxlua/src/internal.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o: ../../wxlua/src/interp.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o: ../../wxlua/src/library.cpp ! $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_appframe.o: ../../wxbind/src/appframe.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.o: ../../wxbind/src/clipdrag.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_config.o: ../../wxbind/src/config.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_controls.o: ../../wxbind/src/controls.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_data.o: ../../wxbind/src/data.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_datetime.o: ../../wxbind/src/datetime.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_defsutil.o: ../../wxbind/src/defsutil.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_dialogs.o: ../../wxbind/src/dialogs.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_event.o: ../../wxbind/src/event.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_file.o: ../../wxbind/src/file.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_fl.o: ../../wxbind/src/fl.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_gdi.o: ../../wxbind/src/gdi.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_geometry.o: ../../wxbind/src/geometry.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o: ../../wxbind/src/grid.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_help.o: ../../wxbind/src/help.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o: ../../wxbind/src/html.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_image.o: ../../wxbind/src/image.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_mdi.o: ../../wxbind/src/mdi.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_menutool.o: ../../wxbind/src/menutool.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_plot.o: ../../wxbind/src/plot.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_print.o: ../../wxbind/src/print.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_regex.o: ../../wxbind/src/regex.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_sizer.o: ../../wxbind/src/sizer.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_socket.o: ../../wxbind/src/socket.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_stc.o: ../../wxbind/src/stc.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_thread.o: ../../wxbind/src/thread.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wave.o: ../../wxbind/src/wave.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_windows.o: ../../wxbind/src/windows.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o: ../../wxbind/src/wxlprint.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlua.o: ../../wxbind/src/wxlua.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o: ../../wxbind/src/wx_class.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_define.o: ../../wxbind/src/wx_define.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_event.o: ../../wxbind/src/wx_event.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_object.o: ../../wxbind/src/wx_object.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_lib_xml.o: ../../wxbind/src/xml.cpp ! $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbind_dll_appframe.o: ../../wxbind/src/appframe.cpp ! $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wx... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:46
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/modules Modified Files: Makefile.in Log Message: updated bakefile build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 20 Jun 2005 09:48:36 -0000 1.5 --- Makefile.in 20 Nov 2005 11:35:18 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 192,196 **** @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) @COND_WX_SHARED_0@__wxlua_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) --- 192,196 ---- @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ./../bin/lua$(EXEEXT) @COND_WX_SHARED_0@__wxlua_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) *************** *** 208,213 **** @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxlua_dll___importlib = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxbind_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxbind$(LIBEXT) --- 208,213 ---- @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxlua_dll___importlib = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxbind_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxbind$(LIBEXT) *************** *** 225,230 **** @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxbind_dll___importlib = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) --- 225,230 ---- @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxbind_dll___importlib = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) *************** *** 246,252 **** @COND_PLATFORM_OS2_1@ -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxluadebug_dll___importlib \ ! @COND_PLATFORM_WIN32_1@ = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluasocket_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) --- 246,252 ---- @COND_PLATFORM_OS2_1@ -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxluadebug_dll___importlib \ ! @COND_WINDOWS_IMPLIB_1@ = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluasocket_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) *************** *** 268,279 **** @COND_PLATFORM_OS2_1@ -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxluasocket_dll___importlib \ ! @COND_PLATFORM_WIN32_1@ = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wx = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wx_4 = .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx_4 = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx_4 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_5 = \ --- 268,282 ---- @COND_PLATFORM_OS2_1@ -import \ @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxluasocket_dll___importlib \ ! @COND_WINDOWS_IMPLIB_1@ = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wx = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx_4 \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx_4 = .0.0.0.$(SO_SUFFIX) + @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx_4 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx_4 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1@__wx_5 = \ |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:45
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 19 Jun 2005 19:11:06 -0000 1.5 --- makefile.vc 20 Nov 2005 11:35:18 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 52,58 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 55,62 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.bcc 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 75,78 **** --- 75,83 ---- !endif + # Use monolithic build of wxWidgets? [0,1] + !ifndef WX_MONOLITHIC + WX_MONOLITHIC = 0 + !endif + # Does the wxLua utilities should be compiled ? [0,1] !ifndef USE_BIN2C *************** *** 112,117 **** -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \ ! -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_APPS="$(USE_APPS)" --- 117,122 ---- -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! -DUSE_BIN2C="$(USE_BIN2C)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_APPS="$(USE_APPS)" Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.wat 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.wat 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 78,84 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" --- 81,88 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" & ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" & ! USE_APPS="$(USE_APPS)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.gcc 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.gcc 20 Nov 2005 11:35:18 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 26,29 **** --- 26,32 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + # Does the wxLua utilities should be compiled ? [0,1] USE_BIN2C = 1 *************** *** 52,58 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 55,62 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### *************** *** 72,75 **** --- 76,80 ---- clean: -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 92,93 **** --- 97,100 ---- + # Dependencies tracking: + -include ./*.d |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:45
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/util/build/bakefiles Removed Files: Bakefiles.bkgen regen.bat Log Message: updated bakefile build system --- regen.bat DELETED --- --- Bakefiles.bkgen DELETED --- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:45
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/build/bakefiles Modified Files: Bakefiles.bkgen Removed Files: globalregen.bat regen.bat Log Message: updated bakefile build system --- regen.bat DELETED --- Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Bakefiles.bkgen 12 Jun 2005 18:29:20 -0000 1.1 --- Bakefiles.bkgen 20 Nov 2005 11:35:17 -0000 1.2 *************** *** 3,12 **** <bakefile-gen> ! <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> ! <input>wxlua.bkl</input> ! <!-- required since wxArt2d uses wx presets stored in wxWidgets subfolders... --> ! <add-flags>-I%WXWIN%\build\bakefiles\wxpresets</add-flags> --- 3,17 ---- <bakefile-gen> ! <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> ! <input> ! ./wxlua.bkl ! ../../apps/build/bakefiles/apps.bkl ! ../../modules/build/bakefiles/modules.bkl ! ../../util/build/bakefiles/util.bkl ! </input> ! <!-- required since wxLua bakefiles use wx presets stored in wxWidgets subfolders... --> ! <add-flags>-I%WXWIN%/build/bakefiles/wxpresets</add-flags> *************** *** 17,50 **** <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland"> ! -o../msw/makefile.bcc ! </add-flags> ! <add-flags formats="dmars_smake"> ! -o../msw/makefile.dms ! </add-flags> ! <add-flags formats="dmars"> ! -o../msw/makefile.dmc ! </add-flags> ! <add-flags formats="mingw"> ! -o../msw/makefile.gcc ! </add-flags> ! <add-flags formats="msvc"> ! -o../msw/makefile.vc ! </add-flags> ! <add-flags formats="watcom"> ! -o../msw/makefile.wat ! </add-flags> ! <add-flags formats="msvc6prj"> ! -o../msw/wxlua.dsw ! </add-flags> ! ! <!-- Directory where AUTOCONF files should go: --> ! <add-flags formats="autoconf"> ! -o../../Makefile.in </add-flags> ! <add-flags formats="autoconf"> ! -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 </add-flags> ! </bakefile-gen> \ No newline at end of file --- 22,43 ---- <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland" >-o$(INPUT_FILE_DIR)/../msw/makefile.bcc</add-flags> ! <add-flags formats="mingw">-o$(INPUT_FILE_DIR)/../msw/makefile.gcc</add-flags> ! <add-flags formats="msvc">-o$(INPUT_FILE_DIR)/../msw/makefile.vc</add-flags> ! <add-flags formats="watcom">-o$(INPUT_FILE_DIR)/../msw/makefile.wat</add-flags> ! <!-- Directories where unix makefiles should go: --> ! <add-flags formats="autoconf">-o$(INPUT_FILE_DIR)/../../Makefile.in</add-flags> ! <add-flags formats="autoconf">-DAUTOCONF_MACROS_FILE=../autoconf/autoconf_inc.m4</add-flags> ! ! ! <!-- the name of the DSW must be lowercase otherwise output libname will be ! lowercase for some targets and for some others it will be mixed... --> ! <add-flags formats="msvc6prj" files="wxlua.bkl"> ! -o$(INPUT_FILE_DIR)/../msw/apps.dsw </add-flags> ! <add-flags formats="msvc6prj" files="modules.bkl"> ! -o$(INPUT_FILE_DIR)/../msw/modules.dsw </add-flags> ! </bakefile-gen> \ No newline at end of file --- globalregen.bat DELETED --- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:45
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837 Modified Files: Makefile.in Added Files: configure Log Message: updated bakefile build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 14 Jun 2005 21:44:39 -0000 1.3 --- Makefile.in 20 Nov 2005 11:35:17 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- NEW FILE: configure --- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for wxLua 1.0. # # Report bugs to <fr...@us...>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. [...7427 lines suppressed...] echo " - VERSION: $WX_VERSION" if test "$WX_PORT" = "gtk"; then if test "$WX_GTKPORT_VERSION" = "1"; then echo " - PORT: gtk (with GTK+ 1.x)" elif test "$WX_GTKPORT_VERSION" = "2" ; then echo " - PORT: gtk (with GTK+ 2.x)" else echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi else echo " - PORT: $WX_PORT" fi echo echo " Now, just run make." echo " ----------------------------------------------------------------" echo |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:41
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/modules/build/bakefiles Removed Files: Bakefiles.bkgen regen.bat Log Message: updated bakefile build system --- regen.bat DELETED --- --- Bakefiles.bkgen DELETED --- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:41
|
Update of /cvsroot/wxlua/wxLua/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/util Modified Files: Makefile.in Log Message: updated bakefile build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 20 Jun 2005 09:48:38 -0000 1.3 --- Makefile.in 20 Nov 2005 11:35:18 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 32,36 **** @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) ### Targets: ### --- 32,36 ---- @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ./../bin/bin2c$(EXEEXT) ### Targets: ### |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:41
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/apps/build/bakefiles Removed Files: Bakefiles.bkgen regen.bat Log Message: updated bakefile build system --- regen.bat DELETED --- --- Bakefiles.bkgen DELETED --- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:41
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/build/autoconf Added Files: acregen.sh autoconf_inc.m4 config.guess config.sub configure.ac install.sh Log Message: updated bakefile build system --- NEW FILE: acregen.sh --- #!/bin/sh # # Author: Francesco Montorsi # RCS-ID: $Id: acregen.sh,v 1.1 2005/11/20 11:35:17 frm Exp $ # Creation date: 14/9/2005 # # A simple script to generate the configure script ( aclocal && autoconf && mv configure ../.. ) --- NEW FILE: autoconf_inc.m4 --- dnl ### begin block 00_header[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### dnl dnl This macro was generated by dnl Bakefile 0.1.9 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9" dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then COND_DEPS_TRACKING_0="" fi AC_SUBST(COND_DEPS_TRACKING_0) dnl ### begin block 20_COND_DEPS_TRACKING_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then COND_DEPS_TRACKING_1="" fi AC_SUBST(COND_DEPS_TRACKING_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_1="#" if test "x$PLATFORM_MACOSX" = "x1" ; then COND_PLATFORM_MACOSX_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then COND_PLATFORM_MAC_1="" fi AC_SUBST(COND_PLATFORM_MAC_1) dnl ### begin block 20_COND_PLATFORM_OS2_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_OS2_1="#" if test "x$PLATFORM_OS2" = "x1" ; then COND_PLATFORM_OS2_1="" fi AC_SUBST(COND_PLATFORM_OS2_1) dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### COND_PLATFORM_WIN32_1="#" if test "x$PLATFORM_WIN32" = "x1" ; then COND_PLATFORM_WIN32_1="" fi AC_SUBST(COND_PLATFORM_WIN32_1) dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### COND_USE_APPS_1="#" if test "x$USE_APPS" = "x1" ; then COND_USE_APPS_1="" fi AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" if test "x$USE_BIN2C" = "x1" ; then COND_USE_BIN2C_1="" fi AC_SUBST(COND_USE_BIN2C_1) dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then COND_USE_SOSYMLINKS_1="" fi AC_SUBST(COND_USE_SOSYMLINKS_1) dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#" if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="" fi AC_SUBST(COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1) dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOVERLINUX_1="#" if test "x$USE_SOVERLINUX" = "x1" ; then COND_USE_SOVERLINUX_1="" fi AC_SUBST(COND_USE_SOVERLINUX_1) dnl ### begin block 20_COND_USE_SOVERSION_0[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOVERSION_0="#" if test "x$USE_SOVERSION" = "x0" ; then COND_USE_SOVERSION_0="" fi AC_SUBST(COND_USE_SOVERSION_0) dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOVERSOLARIS_1="#" if test "x$USE_SOVERSOLARIS" = "x1" ; then COND_USE_SOVERSOLARIS_1="" fi AC_SUBST(COND_USE_SOVERSOLARIS_1) dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### COND_USE_UTIL_1="#" if test "x$USE_UTIL" = "x1" ; then COND_USE_UTIL_1="" fi AC_SUBST(COND_USE_UTIL_1) dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### COND_WINDOWS_IMPLIB_1="#" if test "x$WINDOWS_IMPLIB" = "x1" ; then COND_WINDOWS_IMPLIB_1="" fi AC_SUBST(COND_WINDOWS_IMPLIB_1) dnl ### begin block 20_COND_WX_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### COND_WX_SHARED_0="#" if test "x$WX_SHARED" = "x0" ; then COND_WX_SHARED_0="" fi AC_SUBST(COND_WX_SHARED_0) dnl ### begin block 20_COND_WX_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_WX_SHARED_1="#" if test "x$WX_SHARED" = "x1" ; then COND_WX_SHARED_1="" fi AC_SUBST(COND_WX_SHARED_1) --- NEW FILE: config.guess --- #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. timestamp='2005-09-19' # This file 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 of the License, or # (at your option) any later version. # # This program 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 this program; if not, write to the Free Software [...1426 lines suppressed...] /bin/universe = `(/bin/universe) 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` UNAME_MACHINE = ${UNAME_MACHINE} UNAME_RELEASE = ${UNAME_RELEASE} UNAME_SYSTEM = ${UNAME_SYSTEM} UNAME_VERSION = ${UNAME_VERSION} EOF exit 1 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: --- NEW FILE: config.sub --- #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. # # This file 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 of the License, or # (at your option) any later version. # # This program 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 [...1540 lines suppressed...] -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: --- NEW FILE: install.sh --- #!/bin/sh --- NEW FILE: configure.ac --- # ====================================================================================== # Author: Francesco Montorsi # RCS-ID: $Id: configure.ac,v 1.1 2005/11/20 11:35:17 frm Exp $ # ====================================================================================== AC_INIT([wxLua], [1.0], [fr...@us...]) # ENABLES/DISABLES THE DEBUG MODE FOR THIS CONFIGURE SCRIPT #DBG_CONFIGURE=1 m4_include(wxpresets.m4) AC_PREREQ([2.57]) AC_CONFIG_AUX_DIR([build/autoconf]) AC_LANG(C++) ## CONFIGURE OPTIONS ##################################################################### AM_OPTIONS_WXCONFIG # don't touch this macro AM_OPTIONS_WXPRESETS # don't touch this macro ## CONFIGURE CHECKS ##################################################################### AM_WXPRESETS_FULL([2.4.0], []) ## END OF CONFIGURE SCRIPT ##################################################################### AC_BAKEFILE([m4_include(autoconf_inc.m4)]) AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile]) AC_OUTPUT AM_WXPRESETS_MSG_BEGIN AM_WXPRESETS_MSG_END |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:29
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.vc 14 Jun 2005 21:44:39 -0000 1.3 --- makefile.vc 20 Nov 2005 11:35:17 -0000 1.4 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 44,47 **** --- 44,50 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + *************** *** 52,56 **** ### Variables: ### ! WXLUA_CFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 55,59 ---- ### Variables: ### ! APP_WXLUA_CFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ *************** *** 58,62 **** $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 61,65 ---- $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ *************** *** 64,77 **** $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### !if "$(WX_DEBUG)" == "1" ! WX3RDPARTLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" --- 67,80 ---- $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) ! APP_WXLUA_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res \ ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj ### Conditionally set variables: ### !if "$(WX_DEBUG)" == "1" ! WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" *************** *** 141,144 **** --- 144,207 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u *************** *** 164,168 **** ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: --- 227,231 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: *************** *** 174,196 **** -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $** ! msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) /c /nologo /TC /Fo$@ $(WXLUA_CFLAGS) $** --- 237,255 ---- -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(APP_WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $** ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) /c /nologo /TC /Fo$@ $(APP_WXLUA_CFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.bcc 20 Jun 2005 09:48:35 -0000 1.5 --- makefile.bcc 20 Nov 2005 11:35:17 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 75,78 **** --- 75,83 ---- !endif + # Use monolithic build of wxWidgets? [0,1] + !ifndef WX_MONOLITHIC + WX_MONOLITHIC = 0 + !endif + *************** *** 101,105 **** !if "$(WX_DEBUG)" == "1" ! WX3RDPARTLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" --- 106,110 ---- !if "$(WX_DEBUG)" == "1" ! WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" *************** *** 133,136 **** --- 138,201 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u *************** *** 177,181 **** ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | --- 242,246 ---- ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.wat 20 Jun 2005 09:48:36 -0000 1.5 --- makefile.wat 20 Nov 2005 11:35:17 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 44,47 **** --- 44,50 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + *************** *** 67,73 **** ### Conditionally set variables: ### ! WX3RDPARTLIBPOSTFIX = !ifeq WX_DEBUG 1 ! WX3RDPARTLIBPOSTFIX = d !endif __WARNINGS_0 = --- 70,76 ---- ### Conditionally set variables: ### ! WX3RDPARTYLIBPOSTFIX = !ifeq WX_DEBUG 1 ! WX3RDPARTYLIBPOSTFIX = d !endif __WARNINGS_0 = *************** *** 106,109 **** --- 109,256 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll !endif + __WXLIB_ADV_NAME_p = + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib + !endif + !endif + !endif + __WXLIB_XML_NAME_p = + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib + !endif + !endif + !endif + __WXLIB_CORE_NAME_p = + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib + !endif + !endif + !endif + __WXLIB_BASE_NAME_p = + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 0 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 0 + !ifeq WX_UNICODE 1 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 1 + !ifeq WX_UNICODE 0 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 1 + !ifeq WX_UNICODE 0 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_MONOLITHIC 1 + !ifeq WX_UNICODE 1 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_MONOLITHIC 1 + !ifeq WX_UNICODE 1 + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib + !endif + !endif + !endif __WXUNICODE_DEFINE_p = !ifeq WX_UNICODE 1 *************** *** 183,195 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp ! $(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp ! $(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc --- 330,342 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc *************** *** 197,200 **** watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -zq -fo=$^@ $(APP_WXLUA_CFLAGS) $< --- 344,347 ---- watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.gcc 20 Jun 2005 09:48:36 -0000 1.5 --- makefile.gcc 20 Nov 2005 11:35:17 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 44,47 **** --- 44,50 ---- WX_VERSION = 26 + # Use monolithic build of wxWidgets? [0,1] + WX_MONOLITHIC = 0 + *************** *** 52,55 **** --- 55,59 ---- ### Variables: ### + CPPDEPS = -MT$@ -MF$@.d -MD APP_WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 71,75 **** ifeq ($(WX_DEBUG),1) ! WX3RDPARTLIBPOSTFIX = d endif ifeq ($(WX_UNICODE),1) --- 75,79 ---- ifeq ($(WX_DEBUG),1) ! WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_UNICODE),1) *************** *** 110,113 **** --- 114,257 ---- endif ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),0) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d + endif + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u + endif + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_MONOLITHIC),1) + ifeq ($(WX_UNICODE),1) + __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud + endif + endif + endif + ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = u *************** *** 148,161 **** clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $< mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc --- 292,306 ---- clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o + -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(__WXLIB_ADV_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc *************** *** 163,169 **** mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c ! $(CC) -c -o $@ $(APP_WXLUA_CFLAGS) $< .PHONY: all clean --- 308,316 ---- mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c ! $(CC) -c -o $@ $(APP_WXLUA_CFLAGS) $(CPPDEPS) $< .PHONY: all clean + # Dependencies tracking: + -include mingw$(WXLIBPOSTFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:35:29
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv837/apps Modified Files: Makefile.in Log Message: updated bakefile build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 20 Jun 2005 09:48:35 -0000 1.4 --- Makefile.in 20 Nov 2005 11:35:17 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 43,47 **** @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o --- 43,47 ---- @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/wxlua$(EXEEXT) @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o *************** *** 65,69 **** ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(__app_wxlua___mac_setfilecmd) --- 65,69 ---- ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS) $(__app_wxlua___mac_setfilecmd) |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:03:32
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27382/autoconf Log Message: Directory /cvsroot/wxlua/wxLua/build/autoconf added to the repository |
|
From: John L. <jr...@us...> - 2005-11-20 06:48:01
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14332/wxLua/apps/wxlua/src Removed Files: wrap.bat Log Message: remove unused wrap file --- wrap.bat DELETED --- |
|
From: John L. <jr...@us...> - 2005-11-20 06:39:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13376/wxLua/modules/wxbind/src Added Files: Makefile Log Message: add makefile for wxwidgets binding library --- NEW FILE: Makefile --- # File: Makefile # Author: J Winwood # Created: 2002 # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # # Makefile for wxLuaBinding library using gmake # Override this on the command line to use your own luasetup.h WXLUASETUP = luasetup.h WXCONFIG := wx-config WXDIR = $(shell $(WXCONFIG) --prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXLIBBASE = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) WXRELEASE = $(shell $(WXCONFIG) --release) CXXFLAGS = $(shell $(WXCONFIG) --cxxflags) -MMD -g -Wall LDLIBS = $(shell $(WXCONFIG) --libs) CXX = $(shell $(WXCONFIG) --cxx) APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= LIBVERSION_CURRENT=1 LIBVERSION_REVISION=5 LIBVERSION_AGE=0 TARGET_LIBNAME = lib$(WXLIBBASE)_wxluabind-$(WXRELEASE) TARGET_LIBDIR = $(WXDIR)/lib TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so RM = rm -f AR = ar AROPTIONS = rcu RANLIB = ranlib LN_S = ln -s HEADERS = SOURCES = \ ../../../modules/wxbind/src/appframe.cpp \ ../../../modules/wxbind/src/clipdrag.cpp \ ../../../modules/wxbind/src/config.cpp \ ../../../modules/wxbind/src/controls.cpp \ ../../../modules/wxbind/src/data.cpp \ ../../../modules/wxbind/src/datetime.cpp \ ../../../modules/wxbind/src/defsutil.cpp \ ../../../modules/wxbind/src/dialogs.cpp\ ../../../modules/wxbind/src/event.cpp \ ../../../modules/wxbind/src/file.cpp \ ../../../modules/wxbind/src/fl.cpp \ ../../../modules/wxbind/src/gdi.cpp \ ../../../modules/wxbind/src/geometry.cpp \ ../../../modules/wxbind/src/grid.cpp \ ../../../modules/wxbind/src/help.cpp \ ../../../modules/wxbind/src/html.cpp \ ../../../modules/wxbind/src/image.cpp \ ../../../modules/wxbind/src/mdi.cpp \ ../../../modules/wxbind/src/menutool.cpp \ ../../../modules/wxbind/src/plot.cpp \ ../../../modules/wxbind/src/print.cpp \ ../../../modules/wxbind/src/regex.cpp \ ../../../modules/wxbind/src/sizer.cpp \ ../../../modules/wxbind/src/socket.cpp \ ../../../modules/wxbind/src/stc.cpp \ ../../../modules/wxbind/src/thread.cpp \ ../../../modules/wxbind/src/wave.cpp \ ../../../modules/wxbind/src/windows.cpp \ ../../../modules/wxbind/src/wx_builtin.cpp \ ../../../modules/wxbind/src/wx_class.cpp \ ../../../modules/wxbind/src/wx_define.cpp \ ../../../modules/wxbind/src/wx_event.cpp \ ../../../modules/wxbind/src/wxlhtmlwin.cpp \ ../../../modules/wxbind/src/wxlprint.cpp \ ../../../modules/wxbind/src/wxlua.cpp \ ../../../modules/wxbind/src/wx_object.cpp \ ../../../modules/wxbind/src/xml.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-20 06:36:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12516/wxLua/bindings/wxwidgets Added Files: Makefile Log Message: remove unused files move the binding makefile into the bindings/wxwidgets --- NEW FILE: Makefile --- # # File: makefile.unx # Author: J Winwood # Created: 2002 # Updated: # Copyright: (c) 2002. J Winwood # # # Makefile for generating the bindings WXLUA = ../.. include $(WXLUA)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) DEPFILES=luasetup.h.in $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind genwxbind: $(DEPFILES) @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) # do nothing to clean clean: |
|
From: John L. <jr...@us...> - 2005-11-20 06:36:47
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12516/wxLua/apps/wxlua/src Modified Files: Makefile Makefile_import Removed Files: luasetup.h.in wrap.lua Log Message: remove unused files move the binding makefile into the bindings/wxwidgets --- wrap.lua DELETED --- --- luasetup.h.in DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 19 Nov 2005 07:08:38 -0000 1.4 --- Makefile 20 Nov 2005 06:36:39 -0000 1.5 *************** *** 7,11 **** # Makefile for wxLua standalone sample using gmake ! LUADIR = ../../../modules/lua WXDIR = $(shell wx-config --prefix) WXLIBDIR = $(WXDIR)/lib --- 7,13 ---- # Makefile for wxLua standalone sample using gmake ! WXLUA = ../../.. ! ! LUADIR = $(WXLUA)/modules/lua WXDIR = $(shell wx-config --prefix) WXLIBDIR = $(WXDIR)/lib *************** *** 22,37 **** PROGRAM = wxLua - WXLUA = ../../.. LUA = $(WXLUA)/bin/lua ! LUA_LIBS = ../../../lib/liblua.a ../../../lib/liblualib.a WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE) WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE) WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE) WXFL_LIB = $(WXLIBBASE)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I../../../modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 24,39 ---- PROGRAM = wxLua LUA = $(WXLUA)/bin/lua ! LUA_LIBS = $(WXLUA)/lib/liblua.a $(WXLUA)/lib/liblualib.a WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE) + WXLUABIND_LIB = $(WXLIBBASE)_wxluabind-$(WXRELEASE) WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE) WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE) WXFL_LIB = $(WXLIBBASE)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I$(WXLUA)/modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs *************** *** 40,93 **** # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) ! ! OBJECTS=wxlua.o $(WXLUABINDINGS) ! #wxluawrap.o ../../../modules/wxbind/src/wxlhtmlwin.o ../../../modules/wxbind/src/wxlprint.o DEPFILES=$(OBJECTS:.o=.d) - WXLUABINDINGS = \ - ../../../modules/wxbind/src/appframe.o \ - ../../../modules/wxbind/src/clipdrag.o \ - ../../../modules/wxbind/src/config.o \ - ../../../modules/wxbind/src/controls.o \ - ../../../modules/wxbind/src/data.o \ - ../../../modules/wxbind/src/datetime.o \ - ../../../modules/wxbind/src/defsutil.o \ - ../../../modules/wxbind/src/dialogs.o\ - ../../../modules/wxbind/src/event.o \ - ../../../modules/wxbind/src/file.o \ - ../../../modules/wxbind/src/fl.o \ - ../../../modules/wxbind/src/gdi.o \ - ../../../modules/wxbind/src/geometry.o \ - ../../../modules/wxbind/src/grid.o \ - ../../../modules/wxbind/src/help.o \ - ../../../modules/wxbind/src/html.o \ - ../../../modules/wxbind/src/image.o \ - ../../../modules/wxbind/src/mdi.o \ - ../../../modules/wxbind/src/menutool.o \ - ../../../modules/wxbind/src/plot.o \ - ../../../modules/wxbind/src/print.o \ - ../../../modules/wxbind/src/regex.o \ - ../../../modules/wxbind/src/sizer.o \ - ../../../modules/wxbind/src/socket.o \ - ../../../modules/wxbind/src/stc.o \ - ../../../modules/wxbind/src/thread.o \ - ../../../modules/wxbind/src/wave.o \ - ../../../modules/wxbind/src/windows.o \ - ../../../modules/wxbind/src/wx_builtin.o \ - ../../../modules/wxbind/src/wx_class.o \ - ../../../modules/wxbind/src/wx_define.o \ - ../../../modules/wxbind/src/wx_event.o \ - ../../../modules/wxbind/src/wxlhtmlwin.o \ - ../../../modules/wxbind/src/wxlprint.o \ - ../../../modules/wxbind/src/wxlua.o \ - ../../../modules/wxbind/src/wx_object.o \ - ../../../modules/wxbind/src/xml.o - .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 42,54 ---- # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB) + OBJECTS=wxlua.o DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) *************** *** 98,108 **** bindings: ! make -f Makefile_import editor: $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h ! wxLuaBindings: $(WXLUABINDINGS) ! $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) wxLuaLib: --- 59,69 ---- bindings: ! @(cd $(WXLUA)/bindings/wxwidgets && make) editor: $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h ! wxLuaBindings: ! @(cd $(WXLUA)/modules/wxbind/src && make) wxLuaLib: *************** *** 124,127 **** --- 85,89 ---- @(cd $(WXLUA)/modules/wxluadebug/src && make clean) @(cd $(WXLUA)/modules/wxluasocket/src && make clean) + @(cd $(WXLUA)/modules/wxbind/src && make clean) -include $(DEPFILES) Index: Makefile_import =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile_import 19 Nov 2005 07:08:38 -0000 1.3 --- Makefile_import 20 Nov 2005 06:36:39 -0000 1.4 *************** *** 7,11 **** # # ! # Makefile for wxLua library, Unix WXLUA = ../../.. --- 7,11 ---- # # ! # Makefile for generating the bindings WXLUA = ../../.. *************** *** 23,35 **** all: genwxbind - # This is depricated and does not currenly generate bindings that work with wxLua - wxluawrap.cpp: $(DEPFILES) - $(LUA) -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua - genwxbind: $(DEPFILES) @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) ! #clean: ! # rm -f wxluawrap.cpp ! ! # -include $(DEPFILES) --- 23,28 ---- all: genwxbind genwxbind: $(DEPFILES) @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) ! clean: |
|
From: John L. <jr...@us...> - 2005-11-20 04:09:54
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/wxLua/bindings Modified Files: genwxbind.lua Log Message: everything works in wx27/26 the problem was with dialogs.i Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** genwxbind.lua 19 Nov 2005 23:58:48 -0000 1.4 --- genwxbind.lua 20 Nov 2005 04:09:46 -0000 1.5 *************** *** 59,71 **** -- simple function to completely dump the contents of a table ! function DumpTable(atable, prefix) if prefix == nil then prefix = "" end ! print(prefix.."-Dumping Table ", atable) prefix = prefix.." " for k, v in atable do ! print(prefix..k, v) if type(v) == "table" then ! DumpTable(v, prefix.." ") end end --- 59,75 ---- -- simple function to completely dump the contents of a table ! function DumpTable(atable, prefix, tablelevel) if prefix == nil then prefix = "" end ! if tablelevel == nil then tablelevel = "" end ! ! print(prefix.."-Dumping Table "..tablelevel, atable) prefix = prefix.." " + local n = 0 for k, v in atable do ! n = n + 1 ! print(prefix..n, tablelevel.."["..k.."]", v) if type(v) == "table" then ! DumpTable(v, prefix.." ", tablelevel.."["..k.."]") end end *************** *** 1095,1099 **** local fileData = generateHookBuiltinFileTable() ! writeTableToFile(getHeaderFileName(hook_builtin_file), fileData, false) end --- 1099,1103 ---- local fileData = generateHookBuiltinFileTable() ! writeTableToFile(getOutputFileName(hook_builtin_file), fileData, false) end *************** *** 1279,1283 **** table.insert(parseState.ObjectStack, 1, globals) ! local enumType = "" -- FIXME temp fix local lineCount = table.getn(interfaceData) --- 1283,1287 ---- table.insert(parseState.ObjectStack, 1, globals) ! local enumType = "" -- FIXME temp fix to remember named enums local lineCount = table.getn(interfaceData) *************** *** 1362,1366 **** local condition = parseState.ConditionStack[1] ! table.remove(parseState.ConditionStack, 1) break -- we can stop processing line --- 1366,1370 ---- local condition = parseState.ConditionStack[1] ! table.remove(parseState.ConditionStack, 1) -- pop last %if break -- we can stop processing line *************** *** 1801,1805 **** --local member = AllocMember(lineState) --table.insert(parseState.ObjectStack[1].Members, member) - print("HAS lineState.Action DEFINE name", tag) -- FIXME wxICON_QUESTION is here lineState.Action = nil --- 1805,1808 ---- *************** *** 2182,2192 **** elseif lineState.DefType == "define" then - - if (lineState.Name == "wxICON_QUESTION") or (lineState.Name == "wxICONIZE") then -- FIXME wxICON_QUESTION is here - DumpTable(lineState) - DumpTable(parseState.ConditionStack) - print("Condition", GetCondition(parseState.ConditionStack), lineState.Condition) - end - table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, GetCondition(parseState.ConditionStack))) --- 2185,2188 ---- *************** *** 2241,2254 **** end - - if parseState.ObjectStack[1].Members.DefType == "define" and (parseState.ObjectStack[1].Members.Name == "wxICON_QUESTION") or (parseState.ObjectStack[1].Members.Name == "wxICONIZE") then - DumpTable(parseState.ObjectStack[1].Members, "HAPPY!") - end - - -- pop builtin (globals) parseObject table.insert(objectList, 1, parseState.ObjectStack[1]) table.remove(parseState.ObjectStack, 1) return objectList end --- 2237,2249 ---- end -- pop builtin (globals) parseObject table.insert(objectList, 1, parseState.ObjectStack[1]) table.remove(parseState.ObjectStack, 1) + if table.getn(parseState.ObjectStack) ~= 0 then + print("parseState.ObjectStack should be empty, has "..table.getn(parseState.ObjectStack).." items left.") + DumpTable(parseState.ObjectStack) + end + return objectList end *************** *** 2344,2349 **** local member = parseObject.Members[m] - print("GenerateLuaLanguageBinding MEMBERNAME", member.Name) -- FIXME wxICON_QUESTION is gone - local fullcondition = AddCondition(member.Condition, member.ExtraCondition) --- 2339,2342 ---- *************** *** 2624,2629 **** defineBindingTable[fullcondition][member.Name] = defineBinding - print("Define BINDING", defineBinding.Map) -- FIXME wxICON_QUESTION is gone - -- Define Includes for condition, includeBindingList in interface.includeBindingTable do --- 2617,2620 ---- *************** *** 3781,3784 **** --- 3772,3779 ---- table.insert(fileData, " static WXLUADEFINE defineList[] =\n {\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// %define\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + for condition, defineBindingList in defineBindingTable do if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then *************** *** 3797,3802 **** end for condition, stringBindingList in stringBindingTable do ! if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") --- 3792,3801 ---- end + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// %define %string\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + for condition, stringBindingList in stringBindingTable do ! if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and stringBindingList then if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") *************** *** 3813,3818 **** end for condition, enumBindingList in enumBindingTable do ! if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and defineBindingList then if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") --- 3812,3821 ---- end + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// %enum\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + for condition, enumBindingList in enumBindingTable do ! if (condition ~= nil) and (condition ~= "n") and (condition ~= "") and enumBindingList then if condition ~= "1" then table.insert(fileData, "\n#if "..condition.."\n") |
|
From: John L. <jr...@us...> - 2005-11-20 04:09:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/wxLua/bindings/wxwidgets Modified Files: controls.i dialogs.i print.i windows.i Log Message: everything works in wx27/26 the problem was with dialogs.i Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** windows.i 17 Nov 2005 05:51:20 -0000 1.4 --- windows.i 20 Nov 2005 04:09:46 -0000 1.5 *************** *** 609,615 **** %include "wx/stattext.h" - %define wxALIGN_LEFT - %define wxALIGN_RIGHT - %define wxALIGN_CENTRE %define wxST_NO_AUTORESIZE --- 609,612 ---- Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** controls.i 17 Nov 2005 05:51:20 -0000 1.3 --- controls.i 20 Nov 2005 04:09:46 -0000 1.4 *************** *** 723,727 **** %wxchkver23 %define wxTE_AUTO_URL %wxchkver23 %define wxTE_NOHIDESEL - %define wxHSCROLL %wxchkver23 %define wxTE_LEFT %wxchkver23 %define wxTE_CENTRE --- 723,726 ---- Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** print.i 17 Nov 2005 05:51:20 -0000 1.3 --- print.i 20 Nov 2005 04:09:46 -0000 1.4 *************** *** 421,425 **** // wxPrinterDC ! %if %msw %class %delete wxPrinterDC, wxDC %include "wx/dcprint.h" --- 421,425 ---- // wxPrinterDC ! %if %msw %class %delete wxPrinterDC, wxDC %include "wx/dcprint.h" Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dialogs.i 19 Nov 2005 23:58:49 -0000 1.4 --- dialogs.i 20 Nov 2005 04:09:46 -0000 1.5 *************** *** 32,38 **** %if wxUSE_NUMBERDLG ! %include "wx/numdlg.h" // FIXME not in 2.4 %builtin long wxGetNumberFromUser( const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) ! %endif wxUSE_NUMBERDLG %builtin wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL) --- 32,38 ---- %if wxUSE_NUMBERDLG ! %wxchkver25 %include "wx/numdlg.h" // FIXME not in 2.4 %builtin long wxGetNumberFromUser( const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) ! %endif // wxUSE_NUMBERDLG %builtin wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL) *************** *** 53,64 **** %define wxDIALOG_MODAL %define wxDIALOG_MODELESS - - %define wxCAPTION %define wxDEFAULT_DIALOG_STYLE - %define wxRESIZE_BORDER - %define wxSYSTEM_MENU - %define wxTHICK_FRAME - %define wxSTAY_ON_TOP - %define wxNO_3D %wxchkver23 %define wxDIALOG_NO_PARENT %wxchkver23 %define wxDIALOG_EX_CONTEXTHELP --- 53,57 ---- *************** *** 85,89 **** %endclass ! %endif wxLUA_USE_wxDialog /////////////////////////////////////////////////////////////////////////////// --- 78,82 ---- %endclass ! %endif // wxLUA_USE_wxDialog /////////////////////////////////////////////////////////////////////////////// *************** *** 119,123 **** %endclass ! %endif wxLUA_USE_wxColourDialog /////////////////////////////////////////////////////////////////////////////// --- 112,116 ---- %endclass ! %endif // wxLUA_USE_wxColourDialog /////////////////////////////////////////////////////////////////////////////// *************** *** 184,192 **** %if wxLUA_USE_wxMessageDialog %win %class wxMessageDialog, wxDialog - %gtk|%mac %class %noclassinfo wxMessageDialog, wxDialog wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) int ShowModal() %endclass %endif wxLUA_USE_wxMessageDialog --- 177,196 ---- %if wxLUA_USE_wxMessageDialog + //%win %class wxMessageDialog, wxDialog FIXME THIS DOES NOT WORK CURRENTLY + //%gtk|%mac %class %noclassinfo wxMessageDialog, wxDialog + + %if %win %win %class wxMessageDialog, wxDialog wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) int ShowModal() %endclass + %endif // win + + %if %gtk|%mac + %class %noclassinfo wxMessageDialog, wxDialog + wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) + int ShowModal() + %endclass + %endif // gtk|mac %endif wxLUA_USE_wxMessageDialog |
|
From: John L. <jr...@us...> - 2005-11-19 23:58:57
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4013/wxLua/bindings Modified Files: genwxbind.lua Log Message: add thread.i interface file try to make the bindings work for wxICON_QUESTION, failed has some debugging for now Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** genwxbind.lua 17 Nov 2005 05:51:20 -0000 1.3 --- genwxbind.lua 19 Nov 2005 23:58:48 -0000 1.4 *************** *** 31,37 **** keep = { "[]", "==", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "!" } -- keep delimiters, except for white space ! typeDefs = {} -- all typedefs read from the interface files dataTypes = {} -- all datatypes; int, double, class names ! dataTypeAttribs = {} -- attributes for data types; unsigned, const functionAttribs = {} -- attributes for functions; static, virtual --- 31,37 ---- keep = { "[]", "==", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "!" } -- keep delimiters, except for white space [...5922 lines suppressed...] *************** *** 4413,4420 **** -- BuildConditionsTable(); InitDataTypes() ! readOverrideFile() ! ! generateWrapperFiles() SerializeDataTypes() --- 4392,4400 ---- -- BuildConditionsTable(); InitDataTypes() ! readOverrideFile() ! ! local interfaceList = generateInterfaceData() ! writeWrapperFiles(interfaceList) SerializeDataTypes() |
|
From: John L. <jr...@us...> - 2005-11-19 23:58:57
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4013/wxLua/bindings/wxwidgets Modified Files: dialogs.i wx.rules Added Files: thread.i Log Message: add thread.i interface file try to make the bindings work for wxICON_QUESTION, failed has some debugging for now --- NEW FILE: thread.i --- ///////////////////////////////////////////////////////////////////////////// // Purpose: wx Thread classes // Author: Ray Gilbert // Created: July 2004 // Copyright: (c) Ray Gilbert // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // wxCriticalSection %if wxLUA_USE_wxCriticalSection %include "wx/thread.h" %class %encapsulate %noclassinfo wxCriticalSection wxCriticalSection(); %endclass %endif // wxLUA_USE_wxCriticalSection /////////////////////////////////////////////////////////////////////////////// // wxCriticalSectionLocker %if wxLUA_USE_wxCriticalSectionLocker %include "wx/thread.h" %class %encapsulate %noclassinfo wxCriticalSectionLocker wxCriticalSectionLocker(wxCriticalSection& cs); %endclass %endif // wxLUA_USE_wxCriticalSectionLocker Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dialogs.i 17 Nov 2005 05:51:20 -0000 1.3 --- dialogs.i 19 Nov 2005 23:58:49 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- ///////////////////////////////////////////////////////////////////////////// + %define wxICON_ASTERISK %define wxICON_ERROR Index: wx.rules =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx.rules 17 Nov 2005 05:51:20 -0000 1.2 --- wx.rules 19 Nov 2005 23:58:49 -0000 1.3 *************** *** 29,33 **** interfaceFileList = { - "geometry.i", "appframe.i", "clipdrag.i", --- 29,32 ---- *************** *** 42,50 **** "fl.i", "gdi.i", "grid.i", "help.i", "html.i", "image.i", - "wxlua.i", "mdi.i", "menutool.i", --- 41,49 ---- "fl.i", "gdi.i", + "geometry.i", "grid.i", "help.i", "html.i", "image.i", "mdi.i", "menutool.i", *************** *** 58,61 **** --- 57,61 ---- "wave.i", "windows.i", + "wxlua.i", "xml.i", } |
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/samples Modified Files: editor.wx.lua Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editor.wx.lua 20 Jun 2005 06:55:23 -0000 1.2 --- editor.wx.lua 19 Nov 2005 07:08:39 -0000 1.3 *************** *** 1643,1647 **** table.insert(fileList, ' "'..filePath..'"') end ! wx.wxExecute('"'..programName..'" '..table.concat(fileList)) end) frame:ConnectEvent(wxID_RUN, --- 1643,1649 ---- table.insert(fileList, ' "'..filePath..'"') end ! local cmd = '"'..programName..'" '..table.concat(fileList) ! displayOutput("Running program: "..cmd.."\n") ! wx.wxExecute(cmd, wx.wxEXEC_ASYNC) end) frame:ConnectEvent(wxID_RUN, *************** *** 2077,2079 **** end ! frame:SetIcon(wxLuaEditorIcon) --- 2079,2081 ---- end ! -- frame:SetIcon(wxLuaEditorIcon) FIXME add this back |
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/util/bin2c In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/util/bin2c Added Files: bin2c.lua Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app --- NEW FILE: bin2c.lua --- #! ../../wxLua/Debug/lua ------------------------------------------------------------------------------- -- This program converts a file into a "const unsigned char" buffer and a -- size_t length for use in a c/c++ program. -- -- It outputs to the console so no files are modified, use pipes to redirect. -- -- See "Usage()" function for usage or just run this with no parameters. -- -- The program has two modes, binary and text. -- In text mode; each line of the char buffer is each line in the input file. -- This will minimize the diffs for small changes in files put in CVS. -- In binary mode, the file is dumped 80 cols wide as is. ------------------------------------------------------------------------------- -- formatted print statement function printf(...) io.write(string.format(unpack(arg))) end -- simple test to see if the file exits or not function FileExists(filename) local file = io.open(filename, "r") if (file == nil) then return false end io.close(file) return true end -- Read a file as binary data, returning the data as a string and length -- that includes the terminating null we'll add. function ReadBinaryFile(fileName) local file = assert(io.open(fileName, "rb"), "Invalid input file : '"..tostring(fileName).."'\n") local fileData = file:read("*all") local len = string.len(fileData) + 1 -- added for terminating null of string io.close(file) return fileData, len end -- Create the output header function CreateHeader(stringName, fileName, fileSize) printf("/* Generated by bin2c.lua and should be compiled with your program. */\n") printf("/* Access with : extern const size_t filename_len; */\n") printf("/* extern const unsigned char filename[]; */\n\n") printf("#include <stdio.h> /* for size_t */\n\n") printf("/* Original filename: '%s' */\n", fileName) printf("extern const size_t %s_len;\n", stringName) printf("extern const unsigned char %s[];\n\n", stringName) printf("const size_t %s_len = %d;\n", stringName, fileSize) printf("const unsigned char %s[%d] = {\n", stringName, fileSize) end -- Dump the data for the text file maintaining the original line structure function CreateTextData(fileData) local CR = string.byte("\r") -- DOS = CRLF, Unix = LF, Mac = CR local LF = string.byte("\n") local len = string.len(fileData) local n = 1 while ( n < len ) do local byte = string.byte(fileData, n) printf("%3u,", byte) n = n + 1 -- handle DOS CRLF line endings by adding LF before new line if (byte == CR) and (n <= len) then local next_byte = string.byte(fileData, n) if (next_byte == LF) then printf("%3u,", next_byte) n = n + 1 end end if (byte == CR) or (byte == LF) then printf("\n") end end printf(" 0 };\n\n") end -- Dump the binary data 20 bytes at a time so it's 80 chars wide function CreateBinaryData(fileData) local count = 0 for n = 1, string.len(fileData) do printf("%3u,", string.byte(fileData, n)) count = count + 1 if (count == 20) then printf("\n") count = 0 end end printf(" 0 };\n\n") end -- Print the Usage to the console function Usage() print("Converts files to byte arrays for automatic loading with lua_dobuffer or") print(" more generally for use by any c/c++ program as a const unsigned char buffer.\n") print("Output is to the console - no files are modified.\n") print("Switches :") print(" -b Binary dump for binary files (default)") print(" -t Text dump where the original line structure is maintained") print("Usage : $bin2c.lua [-b or -t] inputfile.lua [cstringname] > inputfile.cpp") print(" If the optional parameter [cstringname] is set, the data is given that name,") print(" otherwise the input filename is converted into a suitable variable name.") print(" file1.cpp contains a header and two variables, the size and the data itself.") print(" const size_t file1_lua_len;") print(" const unsigned char file1_lua[] = { 123, 232, ... , 0 }; ") end -- The main() program to run function main() -- check for input arguments for text or binary input file, if none use bin local is_text = (arg[1] == "-t") or (arg[1] == "/t") local is_binary = (arg[1] == "-b") or (arg[1] == "/b") -- the rest of the args start at this number local arg_n = 1 if (is_text or is_binary) then arg_n = 2 end local fileName = arg[arg_n] if not fileName then Usage() return elseif not FileExists(fileName) then print("Invalid input filename : '"..tostring(fileName).."'\n\n") Usage() return end -- handle the name to use for the char buffer local stringName = "" if arg[arg_n + 1] ~= nil then stringName = arg[arg_n + 1] -- specified name for the string, use it else -- replace all '.' with '_' for the string name based on the filename stringName = string.gsub(fileName, "[.]", "_") -- remove unix path, if any, of the input filename local n = string.find(stringName, "/", 1, 1) while n do stringName = string.sub(stringName, n+1) n = string.find(stringName, "/", 1, 1) end -- remove DOS path, if any, of the input filename local n = string.find(stringName, "\\", 1, 1) while n do stringName = string.sub(stringName, n+1) n = string.find(stringName, "\\", 1, 1) end end local fileData, len = ReadBinaryFile(fileName) CreateHeader(stringName, fileName, len) if is_text then CreateTextData(fileData) else -- default is binary CreateBinaryData(fileData) end end main() |
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/bindings/wxwidgets Modified Files: defsutil.i event.i Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** defsutil.i 17 Nov 2005 05:51:20 -0000 1.4 --- defsutil.i 19 Nov 2005 07:08:39 -0000 1.5 *************** *** 24,28 **** // Process control functions ! // FIXME add wxProcess %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) %builtin void wxExit() --- 24,68 ---- // Process control functions ! %enum ! wxEXEC_ASYNC ! wxEXEC_SYNC ! wxEXEC_NOHIDE ! wxEXEC_MAKE_GROUP_LEADER ! wxEXEC_NODISABLE ! %endenum ! ! %enum ! wxPROCESS_DEFAULT ! wxPROCESS_REDIRECT ! %endenum ! ! // FIXME add wxProcess ! %class %delete %encapsulate wxProcess, wxEvtHandler ! wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) ! //wxProcess(int flags) ! ! //static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) ! static bool Exists(int pid) ! static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) ! virtual void OnTerminate(int pid, int status) ! void Redirect() ! bool IsRedirected() ! void Detach() ! ! %if wxUSE_STREAMS ! wxInputStream *GetInputStream() const ! wxInputStream *GetErrorStream() const ! wxOutputStream *GetOutputStream() const ! void CloseOutput() ! bool IsInputOpened() const ! bool IsInputAvailable() const ! bool IsErrorAvailable() const ! void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) ! %endif // wxUSE_STREAMS ! ! %endclass ! ! !%wxchkver26 %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) ! %wxchkver26 %builtin long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC, wxProcess *process = NULL) %builtin void wxExit() Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** event.i 18 Jun 2005 20:45:58 -0000 1.2 --- event.i 19 Nov 2005 07:08:39 -0000 1.3 *************** *** 22,26 **** %include "wx/event.h" ! %class wxEvent, wxObject //wxEvent(int id = 0) wxObject* GetEventObject() --- 22,26 ---- %include "wx/event.h" ! %class %delete wxEvent, wxObject //wxEvent(int id = 0) wxObject* GetEventObject() *************** *** 461,467 **** %define %event wxEVT_END_PROCESS ! wxProcessEvent(int id = 0, int pid = 0) int GetPid() const %property=Pid, read %endclass --- 461,470 ---- %define %event wxEVT_END_PROCESS ! !%wxchkver26 wxProcessEvent(int id = 0, int pid = 0) ! %wxchkver26 wxProcessEvent(int nId = 0, int pid = 0, int exitcode = 0) int GetPid() const + %wxchkver26 int GetExitCode() %property=Pid, read + %property=ExitCode, read %endclass |
