forked from nhold/wxWidgets
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rebake the rest of the files after TOOLKIT change in MSW bakefile.
This should have been part of r74406 but I only rebaked wxWidgets make/project files themselves and not the samples/utils/demos files in it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
- Loading branch information
Showing
576 changed files
with
14,987 additions
and
22,367 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,19 +16,19 @@ CPPDEPS = -MT$@ [email protected] -MD -MP | |
| WX_RELEASE_NODOT = 29 | ||
| COMPILER_PREFIX = gcc | ||
| OBJS = \ | ||
| $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||
| LIBDIRNAME = \ | ||
| .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) | ||
| $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||
| LIBDIRNAME = \ | ||
| .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) | ||
| SETUPHDIR = \ | ||
| $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||
| BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | ||
| $(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | ||
| $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||
| $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ | ||
| $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ | ||
| $(__MSLU_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 $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS) | ||
| -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) | ||
| BOMBS_OBJECTS = \ | ||
| $(OBJS)\bombs_bombs.o \ | ||
| $(OBJS)\bombs_bombs1.o \ | ||
|
|
@@ -37,26 +37,17 @@ BOMBS_OBJECTS = \ | |
|
|
||
| ### Conditionally set variables: ### | ||
|
|
||
| ifeq ($(TOOLKIT),GTK) | ||
| WIN32_TOOLKIT_LOWERCASE = gtk | ||
| endif | ||
| ifeq ($(TOOLKIT),MSW) | ||
| WIN32_TOOLKIT_LOWERCASE = msw | ||
| endif | ||
| ifeq ($(GCC_VERSION),2.95) | ||
| GCCFLAGS = -fvtable-thunks | ||
| endif | ||
| ifeq ($(USE_GUI),0) | ||
| PORTNAME = base | ||
| endif | ||
| ifeq ($(USE_GUI),1) | ||
| PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | ||
| endif | ||
| ifeq ($(TOOLKIT),MAC) | ||
| WXBASEPORT = _carbon | ||
| endif | ||
| ifeq ($(OFFICIAL_BUILD),1) | ||
| COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD | ||
| PORTNAME = msw$(TOOLKIT_VERSION) | ||
| endif | ||
| ifeq ($(OFFICIAL_BUILD),1) | ||
| COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD | ||
| endif | ||
| ifeq ($(BUILD),debug) | ||
| WXDEBUGFLAG = d | ||
|
|
@@ -82,16 +73,6 @@ endif | |
| ifeq ($(MONOLITHIC),1) | ||
| EXTRALIBS_FOR_BASE = | ||
| endif | ||
| ifeq ($(TOOLKIT),GTK) | ||
| CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields | ||
| endif | ||
| ifeq ($(TOOLKIT),GTK) | ||
| ifeq ($(TOOLKIT_VERSION),2) | ||
| LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \ | ||
| gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \ | ||
| glib-2.0.lib | ||
| endif | ||
| endif | ||
| ifeq ($(BUILD),debug) | ||
| __OPTIMIZEFLAG_2 = -O0 | ||
| endif | ||
|
|
@@ -182,7 +163,7 @@ __WXLIB_CORE_p = \ | |
| endif | ||
| ifeq ($(MONOLITHIC),0) | ||
| __WXLIB_BASE_p = \ | ||
| -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
| -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) | ||
| endif | ||
| ifeq ($(MONOLITHIC),1) | ||
| __WXLIB_MONO_p = \ | ||
|
|
@@ -244,7 +225,7 @@ clean: | |
| -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe | ||
|
|
||
| $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o | ||
| $(CXX) -o $@ $(BOMBS_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) $(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet | ||
| $(CXX) -o $@ $(BOMBS_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet | ||
|
|
||
| $(OBJS)\bombs_bombs.o: ./bombs.cpp | ||
| $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< | ||
|
|
@@ -256,7 +237,7 @@ $(OBJS)\bombs_game.o: ./game.cpp | |
| $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< | ||
|
|
||
| $(OBJS)\bombs_bombs_rc.o: ./bombs.rc | ||
| windres --use-temp-file -i$< -o$@ --define __WX$(TOOLKIT)__ $(__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) --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) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH | ||
|
|
||
| .PHONY: all clean | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.