Deleting void is undefined.

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

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index 957c0430f829e9c116807c9a00a87808ab1b78b4..2e1cc61c3ef7b009cd1a3da94219af541785ed54 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.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -65,24 +65,24 @@ WXDLLFLAG = dll
 __deprecateddll___depname =
 !ifeq SHARED 1
 __deprecateddll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
 !endif
-__DEBUGINFO_1 =
+__DEBUGINFO_2 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
+__DEBUGINFO_2 = debug all
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
+__DEBUGINFO_2 = 
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
+__DEBUGINFO_2 = 
 !endif
 !ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
+__DEBUGINFO_2 = debug all
 !endif
 __WXLIB_MONO_p =
 !ifeq MONOLITHIC 1
@@ -115,22 +115,22 @@ __deprecatedlib___depname =
 __deprecatedlib___depname = &
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 !endif
-__DEBUGINFO =
+__DEBUGINFO_1 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
-__DEBUGINFO = -d2
+__DEBUGINFO_1 = -d2
 !endif
 !endif
 !ifeq BUILD release
 !ifeq DEBUG_INFO default
-__DEBUGINFO = -d0
+__DEBUGINFO_1 = -d0
 !endif
 !endif
 !ifeq DEBUG_INFO 0
-__DEBUGINFO = -d0
+__DEBUGINFO_1 = -d0
 !endif
 !ifeq DEBUG_INFO 1
-__DEBUGINFO = -d2
+__DEBUGINFO_1 = -d2
 !endif
 __OPTIMIZEFLAG =
 !ifeq BUILD debug
@@ -184,12 +184,12 @@ OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+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) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
        -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
+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) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
@@ -206,17 +206,17 @@ DEPRECATEDDLL_OBJECTS =  &
        $(OBJS)\deprecateddll_treelay.obj &
        $(OBJS)\deprecateddll_wxexpr.obj &
        $(OBJS)\deprecateddll_dosyacc.obj
-DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+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) &
        -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated $(CPPFLAGS) &
        $(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) &
-       -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
-       /fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+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) -i=..\..\src\deprecated\..\..\include &
+       -i=..\..\src\deprecated /fh=$(OBJS)\wxprec_deprecatedlib.pch &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 DEPRECATEDLIB_OBJECTS =  &
        $(OBJS)\deprecatedlib_dummy.obj &
        $(OBJS)\deprecatedlib_prop.obj &
@@ -242,17 +242,17 @@ 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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 
 !ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll :  $(DEPRECATEDDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll :  $(DEPRECATEDDLL_OBJECTS)
        @%create $(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc option quiet
        @%append $(OBJS)\deprecateddll.lbc name $^@
        @%append $(OBJS)\deprecateddll.lbc option caseexact
-       @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
        @for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %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)\deprecateddll.lbc library %i
        @%append $(OBJS)\deprecateddll.lbc