Move include/wx/osx/private/objcid.h to include/wx/osx/core.

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

diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 32929d712c2bfa969f161daad394017620b7f3e4..06b16eafcf08d4aea6679c8fd5b343396cb71236 100644 (file)
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/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
@@ -29,8 +29,8 @@ SHAPED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 SHAPED_OBJECTS =  \\r
-       $(OBJS)\shaped_sample_rc.o \
-       $(OBJS)\shaped_shaped.o
+       $(OBJS)\shaped_sample_rc.o \\r
+       $(OBJS)\shaped_shaped.o\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -65,7 +65,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
@@ -218,16 +218,16 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe\r
 \r
-$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample_rc.o
+$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample_rc.o\r
        $(CXX) -o $@ $(SHAPED_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
        for %%f in (star.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
-$(OBJS)\shaped_sample_rc.o: ./../../samples/sample.rc
-       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
-
+$(OBJS)\shaped_sample_rc.o: ./../../samples/sample.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) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
+\r
 $(OBJS)\shaped_shaped.o: ./shaped.cpp\r
        $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $<\r
 \r