Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.5,1.6 makefile.gcc,1.5,1.6 makefile.vc,1.3,1.4 makefile.wat,1.5,1.6
|
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 |
