Unlike the preferences item which should only be enabled if it exists and is enabled...

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

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index 8f46eb6bd3ce5a3870c3c5d85c4087ec5843beae..a3a5ae4d2dcbf1950afc495e9bb3e222702a4adc 100644 (file)
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -62,6 +62,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
@@ -159,7 +166,14 @@ __EXCEPTIONSFLAG =
 __EXCEPTIONSFLAG = 
 !endif
 !ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
+__EXCEPTIONSFLAG = -xr
+!endif
+__EXCEPTIONSFLAG_0 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_0 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_0 = -xs
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
@@ -178,36 +192,30 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_dll$(CFG)
-!endif
 
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-       -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 &
+       -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
        -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
        -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
 DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-       -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 &
+       -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
        -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
        -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated &
-       /fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       /fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) &
+       $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 DEPRECATEDDLL_OBJECTS =  &
        $(OBJS)\deprecateddll_dummy.obj &
        $(OBJS)\deprecateddll_prop.obj &
@@ -220,16 +228,16 @@ DEPRECATEDDLL_OBJECTS =  &
        $(OBJS)\deprecateddll_dosyacc.obj
 DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
        -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 &
-       -wcd=657 -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
-       $(CPPFLAGS) $(CFLAGS)
+       -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
+       -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\deprecated\..\..\include &
+       -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
 DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-       -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 &
+       -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
        -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
-       /fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+       /fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) &
+       $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 DEPRECATEDLIB_OBJECTS =  &
        $(OBJS)\deprecatedlib_dummy.obj &
        $(OBJS)\deprecatedlib_prop.obj &
@@ -255,6 +263,7 @@ 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)\*.pch del $(OBJS)\*.pch
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
@@ -334,3 +343,4 @@ $(OBJS)\deprecatedlib_wxexpr.obj :  .AUTODEPEND ../../src/deprecated\wxexpr.cpp
 
 $(OBJS)\deprecatedlib_dosyacc.obj :  .AUTODEPEND ../../src/deprecated\dosyacc.c
        $(CC) -zq -fo=$^@ $(DEPRECATEDLIB_CFLAGS) $<
+