Rebake.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -22,9 +22,9 @@ SETUPHDIR = \ | ||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| POWER_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) \ | ||||
| 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ | ||||
| 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ | ||||
| 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ | ||||
| 	$(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \ | ||||
| 	$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \ | ||||
| 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ | ||||
| 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||||
| @@ -97,6 +97,12 @@ endif | ||||
| ifeq ($(DEBUG_FLAG),0) | ||||
| __DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 | ||||
| endif | ||||
| ifeq ($(BUILD),release) | ||||
| __NDEBUG_DEFINE_p = -DNDEBUG | ||||
| endif | ||||
| ifeq ($(BUILD),release) | ||||
| __NDEBUG_DEFINE_p_1 = --define NDEBUG | ||||
| endif | ||||
| ifeq ($(USE_EXCEPTIONS),0) | ||||
| __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS | ||||
| endif | ||||
| @@ -225,7 +231,7 @@ $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o | ||||
| 	$(CXX) -o $@ $(POWER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet | ||||
|  | ||||
| $(OBJS)\power_sample_rc.o: ./../../samples/sample.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) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --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) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH | ||||
|  | ||||
| $(OBJS)\power_power.o: ./power.cpp | ||||
| 	$(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $< | ||||
|   | ||||
		Reference in New Issue
	
	Block a user