regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.0 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.0 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -31,7 +31,7 @@ ZIP_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ | ||||
| 	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||
| 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | ||||
| 	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ | ||||
| 	-I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples \ | ||||
| 	-I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) -I.\..\..\..\samples \ | ||||
| 	-DNOPCH $(CPPFLAGS) $(CXXFLAGS) | ||||
| ZIP_OBJECTS =  \ | ||||
| 	$(OBJS)\zip_zip.obj | ||||
| @@ -229,5 +229,5 @@ $(OBJS)\zip_zip.obj: .\zip.cpp | ||||
| 	$(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) $** | ||||
|  | ||||
| $(OBJS)\zip_zip.res: .\zip.rc | ||||
| 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH $** | ||||
| 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH $** | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.0 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -22,8 +22,8 @@ SETUPHDIR = \ | ||||
| ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \ | ||||
| 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ | ||||
| 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ | ||||
| 	$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I.\..\..\..\include \ | ||||
| 	-I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH \ | ||||
| 	$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) \ | ||||
| 	-I.\..\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH \ | ||||
| 	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ | ||||
| 	$(CXXFLAGS) | ||||
| ZIP_OBJECTS =  \ | ||||
| @@ -222,7 +222,7 @@ $(OBJS)\zip_zip.o: ./zip.cpp | ||||
| 	$(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $< | ||||
|  | ||||
| $(OBJS)\zip_zip_rc.o: ./zip.rc | ||||
| 	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH | ||||
| 	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH | ||||
|  | ||||
| .PHONY: all clean data | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.0 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.9 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.0 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -215,7 +215,7 @@ SETUPHDIR = & | ||||
| ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & | ||||
| 	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & | ||||
| 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & | ||||
| 	$(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 & | ||||
| 	$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 & | ||||
| 	-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH & | ||||
| 	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) | ||||
| ZIP_OBJECTS =  & | ||||
| @@ -247,6 +247,7 @@ $(OBJS)\zip.exe :  $(ZIP_OBJECTS) $(OBJS)\zip_zip.res | ||||
| 	@for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i | ||||
| 	@for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  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 $(OBJS)\zip.lbc library %i | ||||
| 	@%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res | ||||
| 	@for %i in () do @%append $(OBJS)\zip.lbc option stack=%i | ||||
| 	wlink @$(OBJS)\zip.lbc | ||||
|  | ||||
| data : .SYMBOLIC  | ||||
| @@ -257,5 +258,5 @@ $(OBJS)\zip_zip.obj :  .AUTODEPEND .\zip.cpp | ||||
| 	$(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\zip_zip.res :  .AUTODEPEND .\zip.rc | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user