Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc, 1.62, 1.63 makefile.gcc, 1.62, 1.63 makefile.vc, 1.62, 1.63 makefile.wat, 1.63, 1.64
|
From: Francesco M. <fr...@us...> - 2007-04-24 14:40:33
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20780/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fix BUILD option values description (which had been wrongly swapped) Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** makefile.vc 24 Apr 2007 14:21:09 -0000 1.62 --- makefile.vc 24 Apr 2007 14:39:50 -0000 1.63 *************** *** 30,35 **** # Builds in debug mode [debug,release] - # debug - Release - # release - Debug BUILD = debug --- 30,33 ---- *************** *** 206,221 **** __RUNTIME_LIBS_67 = $(__THREADING) !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)d_stc.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)ud_stc.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)_stc.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)u_stc.lib - !endif !if "$(WX_SHARED)" == "0" ____WX_SHARED = --- 204,207 ---- *************** *** 478,482 **** ..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 << !endif --- 464,468 ---- ..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 << !endif *************** *** 488,492 **** ..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 << !endif --- 474,478 ---- ..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** makefile.bcc 24 Apr 2007 14:21:09 -0000 1.62 --- makefile.bcc 24 Apr 2007 14:39:49 -0000 1.63 *************** *** 215,230 **** __app_wxluafreeze___depname = ..\..\bin\bcc_$(____app_23)\wxluafreeze.exe !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)d_stc.lib - !endif - !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)ud_stc.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)_stc.lib - !endif - !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)u_stc.lib - !endif !if "$(WX_SHARED)" == "0" ____WX_SHARED = --- 215,218 ---- *************** *** 496,500 **** ..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 484,488 ---- ..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 506,510 **** ..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 494,498 ---- ..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** makefile.wat 24 Apr 2007 14:21:09 -0000 1.63 --- makefile.wat 24 Apr 2007 14:39:51 -0000 1.64 *************** *** 30,35 **** # Builds in debug mode [debug,release] - # debug - Release - # release - Debug BUILD = debug --- 30,33 ---- *************** *** 149,181 **** __app_wxluafreeze___depname = ..\..\bin\wat_$(____app_23)\wxluafreeze.exe !endif - __WXLIB_STC_NAME_p = - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)d_stc.lib - !endif - !endif - !endif - !ifeq BUILD debug - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)ud_stc.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 0 - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)_stc.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq WX_MONOLITHIC 0 - !ifeq UNICODE 1 - __WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)u_stc.lib - !endif - !endif - !endif ____app = !ifeq BUILD debug --- 147,150 ---- *************** *** 640,644 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 609,613 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 660,664 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 629,633 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** makefile.gcc 24 Apr 2007 14:21:09 -0000 1.62 --- makefile.gcc 24 Apr 2007 14:39:49 -0000 1.63 *************** *** 165,196 **** __app_wxluafreeze___depname = ..\..\bin\gcc_$(____app_23)\wxluafreeze.exe endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)d_stc - endif - endif - endif - ifeq ($(BUILD),debug) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)ud_stc - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),0) - __WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)_stc - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(WX_MONOLITHIC),0) - ifeq ($(UNICODE),1) - __WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)u_stc - endif - endif - endif ifeq ($(WX_SHARED),0) ____WX_SHARED = --- 165,168 ---- *************** *** 567,571 **** ifeq ($(USE_WXLUADEBUG),1) ..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 endif endif --- 539,543 ---- ifeq ($(USE_WXLUADEBUG),1) ..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 endif endif *************** *** 578,582 **** ifeq ($(USE_WXLUAEDITAPP),1) ..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 endif endif --- 550,554 ---- ifeq ($(USE_WXLUAEDITAPP),1) ..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_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 endif endif |
