projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix GetTextExtent with non-null font argument, fixes #13750
[wxWidgets.git]
/
samples
/
controls
/
makefile.gcc
diff --git
a/samples/controls/makefile.gcc
b/samples/controls/makefile.gcc
index b3a9903561fbf521caf22e02ab597691c9123de8..5226154718d8049d874ef433a5f9dcdc4aaf0e46 100644
(file)
--- a/
samples/controls/makefile.gcc
+++ b/
samples/controls/makefile.gcc
@@
-1,6
+1,6
@@
# =========================================================================
\r
# This makefile was generated by
\r
# =========================================================================
\r
# This makefile was generated by
\r
-# Bakefile 0.2.
8
(http://www.bakefile.org)
\r
+# Bakefile 0.2.
9
(http://www.bakefile.org)
\r
# Do not modify, all changes will be overwritten!
\r
# =========================================================================
\r
\r
# Do not modify, all changes will be overwritten!
\r
# =========================================================================
\r
\r
@@
-22,9
+22,9
@@
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
\r
CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
\r
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
\r
CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
\r
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
\r
- $(__DEBUG_DEFINE_p) $(__
EXCEPTIONS_DEFINE_p) $(__RTTI
_DEFINE_p) \
\r
- $(__
THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU
_DEFINE_p) \
\r
- $(__
GFXCTX
_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
\r
+ $(__DEBUG_DEFINE_p) $(__
NDEBUG_DEFINE_p) $(__EXCEPTIONS
_DEFINE_p) \
\r
+ $(__
RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE
_DEFINE_p) \
\r
+ $(__
MSLU
_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
\r
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
\r
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
\r
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
\r
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
\r
-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
\r
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
\r
@@
-97,6
+97,12
@@
endif
ifeq ($(DEBUG_FLAG),0)
\r
__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
\r
endif
\r
ifeq ($(DEBUG_FLAG),0)
\r
__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
\r
endif
\r
+ifeq ($(BUILD),release)
\r
+__NDEBUG_DEFINE_p = -DNDEBUG
\r
+endif
\r
+ifeq ($(BUILD),release)
\r
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
\r
+endif
\r
ifeq ($(USE_EXCEPTIONS),0)
\r
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
\r
endif
\r
ifeq ($(USE_EXCEPTIONS),0)
\r
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
\r
endif
\r
@@
-133,12
+139,6
@@
endif
ifeq ($(MSLU),1)
\r
__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
\r
endif
\r
ifeq ($(MSLU),1)
\r
__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
\r
endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
\r
-endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
\r
-endif
\r
ifeq ($(USE_CAIRO),1)
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
\r
endif
\r
ifeq ($(USE_CAIRO),1)
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
\r
endif
\r
@@
-175,9
+175,6
@@
endif
ifeq ($(MSLU),1)
\r
__UNICOWS_LIB_p = -lunicows
\r
endif
\r
ifeq ($(MSLU),1)
\r
__UNICOWS_LIB_p = -lunicows
\r
endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GDIPLUS_LIB_p = -lgdiplus
\r
-endif
\r
ifeq ($(USE_CAIRO),1)
\r
__CAIRO_LIB_p = -lcairo
\r
endif
\r
ifeq ($(USE_CAIRO),1)
\r
__CAIRO_LIB_p = -lcairo
\r
endif
\r
@@
-222,7
+219,7
@@
clean:
-if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
\r
\r
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o
\r
-if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe
\r
\r
$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o
\r
- $(CXX) -o $@ $(CONTROLS_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
\r
+ $(CXX) -o $@ $(CONTROLS_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
\r
\r
data:
\r
if not exist $(OBJS) mkdir $(OBJS)
\r
\r
data:
\r
if not exist $(OBJS) mkdir $(OBJS)
\r
@@
-232,7
+229,7
@@
$(OBJS)\controls_controls.o: ./controls.cpp
$(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $<
\r
\r
$(OBJS)\controls_controls_rc.o: ./controls.rc
\r
$(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $<
\r
\r
$(OBJS)\controls_controls_rc.o: ./controls.rc
\r
- 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
\r
+ 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
\r
\r
.PHONY: all clean data
\r
\r
\r
.PHONY: all clean data
\r
\r
projects / wxWidgets.git / blobdiff