Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.6,1.7 makefile.gcc,1.6,1.7 makefile.vc,1.4,1.5 makefile.wat,1.6,1.7
|
From: John L. <jr...@us...> - 2005-11-23 06:03:50
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25784/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked the build files to remove the unused wxluawrap.cpp file started docs for building wxlua Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.vc 20 Nov 2005 11:35:17 -0000 1.4 --- makefile.vc 23 Nov 2005 06:03:40 -0000 1.5 *************** *** 11,23 **** # ------------------------------------------------------------------------- - # C compiler - CC = cl - # C++ compiler CXX = cl - # Standard flags for CC - CFLAGS = - # Standard flags for C++ CXXFLAGS = --- 11,17 ---- *************** *** 44,50 **** WX_VERSION = 26 - # Use monolithic build of wxWidgets? [0,1] - WX_MONOLITHIC = 0 - --- 38,41 ---- *************** *** 55,64 **** ### Variables: ### - APP_WXLUA_CFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ - /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ - /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \ - $(__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__ \ --- 46,49 ---- *************** *** 70,75 **** 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: ### --- 55,59 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ ! msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ### Conditionally set variables: ### *************** *** 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 --- 128,131 ---- *************** *** 239,243 **** ..\..\..\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 << --- 163,167 ---- ..\..\..\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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib 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 << *************** *** 251,255 **** 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) $** - --- 175,176 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.bcc 20 Nov 2005 11:35:17 -0000 1.6 --- makefile.bcc 23 Nov 2005 06:03:40 -0000 1.7 *************** *** 20,28 **** # ------------------------------------------------------------------------- - # C compiler - !ifndef CC - CC = bcc32 - !endif - # C++ compiler !ifndef CXX --- 20,23 ---- *************** *** 30,38 **** !endif - # Standard flags for CC - !ifndef CFLAGS - CFLAGS = - !endif - # Standard flags for C++ !ifndef CXXFLAGS --- 25,28 ---- *************** *** 75,83 **** !endif - # Use monolithic build of wxWidgets? [0,1] - !ifndef WX_MONOLITHIC - WX_MONOLITHIC = 0 - !endif - --- 65,68 ---- *************** *** 88,96 **** ### Variables: ### - APP_WXLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ - -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ - -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ - -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 73,76 ---- *************** *** 100,105 **** APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj ### Conditionally set variables: ### --- 80,84 ---- APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj ### Conditionally set variables: ### *************** *** 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 --- 117,120 ---- *************** *** 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 | --- 161,165 ---- ..\..\..\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$(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 | *************** *** 254,258 **** brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $** - borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c - $(CC) -q -c -P- -o$@ $(APP_WXLUA_CFLAGS) $** - --- 173,174 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.wat 20 Nov 2005 11:35:17 -0000 1.6 --- makefile.wat 23 Nov 2005 06:03:40 -0000 1.7 *************** *** 11,23 **** # ------------------------------------------------------------------------- - # C compiler - CC = wcc386 - # C++ compiler CXX = wpp386 - # Standard flags for CC - CFLAGS = - # Standard flags for C++ CXXFLAGS = --- 11,17 ---- *************** *** 44,50 **** WX_VERSION = 26 - # Use monolithic build of wxWidgets? [0,1] - WX_MONOLITHIC = 0 - --- 38,41 ---- *************** *** 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 --- 100,103 ---- *************** *** 291,299 **** ### Variables: ### - APP_WXLUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & - -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & - -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & - $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & - $(CFLAGS) APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & --- 138,141 ---- *************** *** 303,308 **** APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj & ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj --- 145,149 ---- APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj *************** *** 330,347 **** @%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 wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< - watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c - $(CC) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CFLAGS) $< - --- 171,185 ---- @%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$(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) -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 wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.gcc 20 Nov 2005 11:35:17 -0000 1.6 --- makefile.gcc 23 Nov 2005 06:03:40 -0000 1.7 *************** *** 11,23 **** # ------------------------------------------------------------------------- - # C compiler - CC = gcc - # C++ compiler CXX = g++ - # Standard flags for CC - CFLAGS = - # Standard flags for C++ CXXFLAGS = --- 11,17 ---- *************** *** 44,50 **** WX_VERSION = 26 - # Use monolithic build of wxWidgets? [0,1] - WX_MONOLITHIC = 0 - --- 38,41 ---- *************** *** 56,64 **** CPPDEPS = -MT$@ -MF$@.d -MD - APP_WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ - -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ - -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ - -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) APP_WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 47,50 ---- *************** *** 69,74 **** mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o ### Conditionally set variables: ### --- 55,59 ---- mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ### Conditionally set variables: ### *************** *** 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 --- 99,102 ---- *************** *** 296,300 **** ..\..\..\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 --- 141,145 ---- ..\..\..\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$(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 *************** *** 307,313 **** windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1) - mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c - $(CC) -c -o $@ $(APP_WXLUA_CFLAGS) $(CPPDEPS) $< - .PHONY: all clean --- 152,155 ---- |
