Regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.1.4 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.1.6 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -15,13 +15,14 @@ include ../../build/msw/config.gcc | ||||
| WX_RELEASE_NODOT = 25 | ||||
| OBJS = \ | ||||
| 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) | ||||
| SETUPHDIR = \ | ||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ | ||||
| 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ | ||||
| 	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ | ||||
| 	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -W -Wall -I. \ | ||||
| 	$(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__EXCEPTIONSFLAG_4) \ | ||||
| 	$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) | ||||
| 	$(__EXCEPTIONSFLAG_5) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||||
| CONFTEST_OBJECTS =  \ | ||||
| 	$(OBJS)\conftest_conftest.o \ | ||||
| 	$(OBJS)\conftest_conftest_rc.o | ||||
| @@ -54,6 +55,12 @@ endif | ||||
| ifeq ($(SHARED),1) | ||||
| WXDLLFLAG = dll | ||||
| endif | ||||
| ifeq ($(SHARED),0) | ||||
| LIBTYPE_SUFFIX = lib | ||||
| endif | ||||
| ifeq ($(SHARED),1) | ||||
| LIBTYPE_SUFFIX = dll | ||||
| endif | ||||
| ifeq ($(MONOLITHIC),0) | ||||
| EXTRALIBS_FOR_BASE =  | ||||
| endif | ||||
| @@ -136,12 +143,6 @@ endif | ||||
| ifeq ($(MSLU),1) | ||||
| __UNICOWS_LIB_p = -lunicows | ||||
| endif | ||||
| ifeq ($(SHARED),0) | ||||
| LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG) | ||||
| endif | ||||
| ifeq ($(SHARED),1) | ||||
| LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG) | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| ifeq ($(DEBUG_INFO),default) | ||||
| __DEBUGINFO = -g | ||||
| @@ -179,6 +180,7 @@ $(OBJS)\conftest_conftest.o: ./conftest.cpp | ||||
| 	$(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\conftest_conftest_rc.o: ./conftest.rc | ||||
| 	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_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) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH | ||||
|  | ||||
| .PHONY: all clean | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user