Correct placement of calling convention keyword: must follow the return type.

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

diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index 4ee7eac23add23041b45deb602fbb6abdb4c2f52..4f2ad4dadb92715de974774c3141fc4bedb19dfb 100644 (file)
--- a/samples/mdi/makefile.gcc
+++ b/samples/mdi/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -24,9 +24,9 @@ MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \\r
        $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \\r
-       -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
-       -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \\r
-       $(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
 MDI_OBJECTS =  \\r
        $(OBJS)\mdi_mdi.o \\r
        $(OBJS)\mdi_mdi_rc.o\r
@@ -138,6 +138,12 @@ endif
 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_p = --include-dir $(CAIRO_ROOT)/include/cairo\r
+endif\r
 ifeq ($(SHARED),1)\r
 __DLLFLAG_p = -DWXUSINGDLL\r
 endif\r
@@ -171,6 +177,12 @@ endif
 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_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\r
+endif\r
 ifeq ($(BUILD),debug)\r
 ifeq ($(DEBUG_INFO),default)\r
 __DEBUGINFO = -g\r
@@ -209,13 +221,13 @@ clean:
        -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe\r
 \r
 $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o\r
-       $(CXX) -o $@ $(MDI_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\r
+       $(CXX) -o $@ $(MDI_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
 \r
 $(OBJS)\mdi_mdi.o: ./mdi.cpp\r
        $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\mdi_mdi_rc.o: ./mdi.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 --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) $(__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
 \r
 .PHONY: all clean\r
 \r