do only what is necessary in SetScrollbars(), let the base class do the rest

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

diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index 2d03bf15ea254cb3d4cb16f160d541aba7acc2c9..08351a2a3149146730f33a32b34f3b8f10b718f2 100644 (file)
--- a/samples/exec/makefile.gcc
+++ b/samples/exec/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = gcc
 OBJS = \
@@ -28,8 +28,8 @@ EXEC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
        -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
        $(CPPFLAGS) $(CXXFLAGS)
 EXEC_OBJECTS =  \
-       $(OBJS)\exec_exec.o \
-       $(OBJS)\exec_exec_rc.o
+       $(OBJS)\exec_sample_rc.o \
+       $(OBJS)\exec_exec.o
 
 ### Conditionally set variables: ###
 
@@ -223,17 +223,19 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
 
-$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec_rc.o
-       $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o
+       $(CXX) -o $@ $(EXEC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\exec_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 --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
 $(OBJS)\exec_exec.o: ./exec.cpp
        $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\exec_exec_rc.o: ./exec.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 --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
 .PHONY: all clean
 
 
+SHELL := $(COMSPEC)
+
 # Dependencies tracking:
 -include $(OBJS)/*.d