Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 9b6f197b16ec9c339271b974c1fc925063dc0b39..0699d331a49fa71ad1bd87d3e8dd487c245cac14 100644 (file)
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,7 +12,7 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP

 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = gcc
 OBJS = \
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = gcc
 OBJS = \


@@ -224,7 +224,7 @@ clean:
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
 
 $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o
        -if exist $(OBJS)\font.exe del $(OBJS)\font.exe
 
 $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o

-       $(CXX) -o $@ $(FONT_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
+       $(CXX) -o $@ $(FONT_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)\font_font.o: ./font.cpp
        $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\font_font.o: ./font.cpp
        $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $<


@@ -235,5 +235,7 @@ $(OBJS)\font_font_rc.o: ./font.rc
 .PHONY: all clean
 
 
 .PHONY: all clean
 
 

+SHELL := $(COMSPEC)
+

 # Dependencies tracking:
 -include $(OBJS)/*.d
 # Dependencies tracking:
 -include $(OBJS)/*.d