Remove the MSVC solution files added with the new dll sample.

[wxWidgets.git] / samples / caret / makefile.wat

diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat
index ab1c7b3864e21ed162c00d355132456c68563cd8..e2b47ffc1978484e5eaa7fb0be194c6134380339 100644 (file)
--- a/samples/caret/makefile.wat
+++ b/samples/caret/makefile.wat
@@ -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
@@ -168,6 +168,14 @@ __GDIPLUS_LIB_p =
 !ifeq USE_GDIPLUS 1\r
 __GDIPLUS_LIB_p = gdiplus.lib\r
 !endif\r
+__CAIRO_LIB_p =\r
+!ifeq USE_CAIRO 1\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+____CAIRO_LIBDIR_FILENAMES_p =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib\r
+!endif\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
@@ -199,6 +207,10 @@ __GFXCTX_DEFINE_p =
 !ifeq USE_GDIPLUS 1\r
 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
 !endif\r
+____CAIRO_INCLUDEDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
+!endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 __DLLFLAG_p = -dWXUSINGDLL\r
@@ -217,9 +229,9 @@ CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
        $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\r
+       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
 CARET_OBJECTS =  &\r
        $(OBJS)\caret_caret.obj\r
 \r
@@ -245,9 +257,9 @@ $(OBJS)\caret.exe :  $(CARET_OBJECTS) $(OBJS)\caret_caret.res
        @%append $(OBJS)\caret.lbc option quiet\r
        @%append $(OBJS)\caret.lbc name $^@\r
        @%append $(OBJS)\caret.lbc option caseexact\r
-       @%append $(OBJS)\caret.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
+       @%append $(OBJS)\caret.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i\r
-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i\r
        @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res\r
        @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i\r
        wlink @$(OBJS)\caret.lbc\r
@@ -256,5 +268,5 @@ $(OBJS)\caret_caret.obj :  .AUTODEPEND .\caret.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $<\r
 \r
 $(OBJS)\caret_caret.res :  .AUTODEPEND .\caret.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
 \r