Updates to MIME-types and wxFileDialog code for better

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

diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat
index 3851a1792bb5ef5023f6244d291f022fbc24cea4..cb8af56a616cbde197d1a9118da9b92828097c89 100644 (file)
--- a/contrib/build/animate/makefile.wat
+++ b/contrib/build/animate/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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


@@ -50,10 +50,6 @@ WXDEBUGFLAG = d
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif
 !ifeq DEBUG_FLAG 1
 WXDEBUGFLAG = d
 !endif

-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif

 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u
 WXUNICODEFLAG =
 !ifeq UNICODE 1
 WXUNICODEFLAG = u


@@ -62,22 +58,14 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

-__DEBUGINFO =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO = -d0
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll

 !endif
 !endif

-!ifeq DEBUG_INFO 1
-__DEBUGINFO = -d2
+__animatedll___depname =
+!ifeq SHARED 1
+__animatedll___depname = &
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll

 !endif
 __DEBUGINFO_1 =
 !ifeq BUILD debug
 !endif
 __DEBUGINFO_1 =
 !ifeq BUILD debug


@@ -96,14 +84,14 @@ __DEBUGINFO_1 =
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif
 !ifeq DEBUG_INFO 1
 __DEBUGINFO_1 = debug all
 !endif

-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib

 !endif
 !endif

-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib

 !endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 !endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1


@@ -113,9 +101,36 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif

-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+__animatelib___depname =
+!ifeq SHARED 0
+__animatelib___depname = &
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+!endif
+__DEBUGINFO =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2

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


@@ -131,75 +146,61 @@ __RUNTIME_LIBS = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif

-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 

 !endif
 !endif

-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs

 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif

-__animatedll___depname =
-!ifeq SHARED 1
-__animatedll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__

 !endif
 !endif

-__animatelib___depname =
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+LIBDIRNAME =

 !ifeq SHARED 0
 !ifeq SHARED 0

-__animatelib___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = ..\..\src\animate\..\..\..\lib\wat_dll$(CFG)

 !endif
 
 ### Variables: ###
 
 !endif
 
 ### Variables: ###
 

-ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include &
-       -i=$(LIBDIRNAME) -i=..\..\src\animate\..\..\..\src\tiff &
-       -i=..\..\src\animate\..\..\..\src\jpeg &
-       -i=..\..\src\animate\..\..\..\src\png &
-       -i=..\..\src\animate\..\..\..\src\zlib &
-       -i=..\..\src\animate\..\..\..\src\regex &
-       -i=..\..\src\animate\..\..\..\src\expat\lib &
+OBJS = &
+       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ANIMATEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=..\..\src\animate\..\..\..\include -i=$(SETUPHDIR) &

        -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE &
        -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE &

-       $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch
+       /fh=$(OBJS)\wxprec_animatedll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 ANIMATEDLL_OBJECTS =  &
        $(OBJS)\animatedll_dummy.obj &
        $(OBJS)\animatedll_animate.obj
 ANIMATEDLL_OBJECTS =  &
        $(OBJS)\animatedll_dummy.obj &
        $(OBJS)\animatedll_animate.obj

-ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include &
-       -i=$(LIBDIRNAME) -i=..\..\src\animate\..\..\..\src\tiff &
-       -i=..\..\src\animate\..\..\..\src\jpeg &
-       -i=..\..\src\animate\..\..\..\src\png &
-       -i=..\..\src\animate\..\..\..\src\zlib &
-       -i=..\..\src\animate\..\..\..\src\regex &
-       -i=..\..\src\animate\..\..\..\src\expat\lib &
-       -i=..\..\src\animate\..\..\include $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_animatelib.pch
+ANIMATELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=..\..\src\animate\..\..\..\include -i=$(SETUPHDIR) &
+       -i=..\..\src\animate\..\..\include /fh=$(OBJS)\wxprec_animatelib.pch &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 ANIMATELIB_OBJECTS =  &
        $(OBJS)\animatelib_dummy.obj &
        $(OBJS)\animatelib_animate.obj
 ANIMATELIB_OBJECTS =  &
        $(OBJS)\animatelib_dummy.obj &
        $(OBJS)\animatelib_animate.obj

-LIBDIRNAME = &
-       ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OBJS = &
-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -210,27 +211,24 @@ $(OBJS) :
 
 all : .SYMBOLIC $(__animatedll___depname) $(__animatelib___depname)
 
 
 all : .SYMBOLIC $(__animatedll___depname) $(__animatelib___depname)
 

-$(OBJS)\animatedll_animate.obj :  .AUTODEPEND ../../src/animate\animate.cpp
-       $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
-
-$(OBJS)\animatedll_dummy.obj :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
-
-$(OBJS)\animatelib_animate.obj :  .AUTODEPEND ../../src/animate\animate.cpp
-       $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
-
-$(OBJS)\animatelib_dummy.obj :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
+clean : .SYMBOLIC 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -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)_animate_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib

 
 !ifeq SHARED 1
 
 !ifeq SHARED 1

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll :  $(ANIMATEDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll :  $(ANIMATEDLL_OBJECTS)

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

-       @%append $(OBJS)\animatedll.lbc option incremental
+       @%append $(OBJS)\animatedll.lbc option caseexact

        @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i
        @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\animatedll.lbc library %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)\animatedll.lbc library %i

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


@@ -241,14 +239,17 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animat
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib :  $(ANIMATELIB_OBJECTS)
        @%create $(OBJS)\animatelib.lbc
        @for %i in ($(ANIMATELIB_OBJECTS)) do @%append $(OBJS)\animatelib.lbc +%i
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib :  $(ANIMATELIB_OBJECTS)
        @%create $(OBJS)\animatelib.lbc
        @for %i in ($(ANIMATELIB_OBJECTS)) do @%append $(OBJS)\animatelib.lbc +%i

-       wlib -q -p2048 -n -b $^@ @$(OBJS)\animatelib.lbc
+       wlib -q -p4096 -n -b $^@ @$(OBJS)\animatelib.lbc

 !endif
 
 !endif
 

-clean : .SYMBOLIC 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -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)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
+$(OBJS)\animatedll_dummy.obj :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
+       $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
+
+$(OBJS)\animatedll_animate.obj :  .AUTODEPEND ../../src/animate\animate.cpp
+       $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
+
+$(OBJS)\animatelib_dummy.obj :  .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
+       $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
+
+$(OBJS)\animatelib_animate.obj :  .AUTODEPEND ../../src/animate\animate.cpp
+       $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<