Make a couple virtuals protected so they can be overridden.

[wxWidgets.git] / samples / dnd / makefile.gcc

diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index 17ea9fe413a61485b307e1e2fb512c79305ba401..89c65122f40ad1641c8deb3b3233b0ab64b2915c 100644 (file)
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\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
@@ -24,10 +24,9 @@ DND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
        $(__NDEBUG_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
-       $(____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
+       -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \\r
+       -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DND_OBJECTS =  \\r
        $(OBJS)\dnd_dnd.o \\r
        $(OBJS)\dnd_dnd_rc.o\r
@@ -65,7 +64,7 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
@@ -139,12 +138,6 @@ endif
 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
@@ -181,9 +174,6 @@ endif
 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
@@ -228,7 +218,7 @@ clean:
        -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe\r
 \r
 $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o\r
-       $(CXX) -o $@ $(DND_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 $@ $(DND_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
@@ -238,7 +228,7 @@ $(OBJS)\dnd_dnd.o: ./dnd.cpp
        $(CXX) -c -o $@ $(DND_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\dnd_dnd_rc.o: ./dnd.rc\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) $(__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