removed src/gtk/eggtrayicon.h

[wxWidgets.git] / contrib / build / plot / makefile.wat

diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat
index c890c5936b8a3f7cdd1300a9315abc7e33149d3c..794c0c740be0f5958301b049209fbdd9ecb5c883 100644 (file)
--- a/contrib/build/plot/makefile.wat
+++ b/contrib/build/plot/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

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


@@ -65,29 +65,29 @@ WXDLLFLAG = dll
 __plotdll___depname =
 !ifeq SHARED 1
 __plotdll___depname = &
 __plotdll___depname =
 !ifeq SHARED 1
 __plotdll___depname = &

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll

 !endif
 !endif

-__DEBUGINFO_1 =
+__DEBUGINFO_2 =

 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default

-__DEBUGINFO_1 = debug all
+__DEBUGINFO_2 = debug all

 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default

-__DEBUGINFO_1 = 
+__DEBUGINFO_2 = 

 !endif
 !endif
 !ifeq DEBUG_INFO 0
 !endif
 !endif
 !ifeq DEBUG_INFO 0

-__DEBUGINFO_1 = 
+__DEBUGINFO_2 = 

 !endif
 !ifeq DEBUG_INFO 1
 !endif
 !ifeq DEBUG_INFO 1

-__DEBUGINFO_1 = debug all
+__DEBUGINFO_2 = debug all

 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
 __WXLIB_MONO_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1
 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1


@@ -104,33 +104,34 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0

-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_BASE_p = &
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 __plotlib___depname =
 !ifeq SHARED 0
 __plotlib___depname = &
 !endif
 __plotlib___depname =
 !ifeq SHARED 0
 __plotlib___depname = &

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib

 !endif
 !endif

-__DEBUGINFO =
+__DEBUGINFO_1 =

 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default

-__DEBUGINFO = -d2
+__DEBUGINFO_1 = -d2

 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default

-__DEBUGINFO = -d0
+__DEBUGINFO_1 = -d0

 !endif
 !endif
 !ifeq DEBUG_INFO 0
 !endif
 !endif
 !ifeq DEBUG_INFO 0

-__DEBUGINFO = -d0
+__DEBUGINFO_1 = -d0

 !endif
 !ifeq DEBUG_INFO 1
 !endif
 !ifeq DEBUG_INFO 1

-__DEBUGINFO = -d2
+__DEBUGINFO_1 = -d2

 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug
 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug


@@ -180,11 +181,13 @@ LIBDIRNAME = ..\..\src\plot\..\..\..\lib\wat_dll$(CFG)
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+WX_RELEASE_NODOT = 25
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &

        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
        -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT &
        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
        -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT &


@@ -192,7 +195,7 @@ PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 PLOTDLL_OBJECTS =  &
        $(OBJS)\plotdll_dummy.obj &
        $(OBJS)\plotdll_plot.obj
 PLOTDLL_OBJECTS =  &
        $(OBJS)\plotdll_dummy.obj &
        $(OBJS)\plotdll_plot.obj

-PLOTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+PLOTLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &

        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
        -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\plot\..\..\include /fh=$(OBJS)\wxprec_plotlib.pch &
        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
        -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\plot\..\..\include /fh=$(OBJS)\wxprec_plotlib.pch &


@@ -215,27 +218,27 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib

 
 !ifeq SHARED 1
 
 !ifeq SHARED 1

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_wat$(VENDORTAG).dll :  $(PLOTDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG).dll :  $(PLOTDLL_OBJECTS)

        @%create $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc option quiet
        @%append $(OBJS)\plotdll.lbc name $^@
        @%append $(OBJS)\plotdll.lbc option caseexact
        @%create $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc option quiet
        @%append $(OBJS)\plotdll.lbc name $^@
        @%append $(OBJS)\plotdll.lbc option caseexact

-       @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)

        @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
        @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i

-       @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   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 odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
+       @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   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 odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i

        @%append $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc system nt_dll
        wlink @$(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc system nt_dll
        wlink @$(OBJS)\plotdll.lbc

-       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib +$^@
+       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib +$^@

 !endif
 
 !ifeq SHARED 0
 !endif
 
 !ifeq SHARED 0

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib :  $(PLOTLIB_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib :  $(PLOTLIB_OBJECTS)

        @%create $(OBJS)\plotlib.lbc
        @for %i in ($(PLOTLIB_OBJECTS)) do @%append $(OBJS)\plotlib.lbc +%i
        wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc
        @%create $(OBJS)\plotlib.lbc
        @for %i in ($(PLOTLIB_OBJECTS)) do @%append $(OBJS)\plotlib.lbc +%i
        wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc