Cleaned up some comments, reorganized some code

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

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index f95b620d0cf859a884a28043100325bbd11a863f..6e6f78835cbbaaef23c55693d496fb1bd44f2244 100644 (file)
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -177,12 +177,13 @@ DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -bd $(__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 -dWXUSINGDLL &
-       -dWXMAKINGDLL_DEPRECATED $(CFLAGS)
+       -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CFLAGS)
 DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__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 -dWXUSINGDLL &
-       -dWXMAKINGDLL_DEPRECATED $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecateddll.pch
+       -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_deprecateddll.pch
 DEPRECATEDDLL_OBJECTS =  &
        $(OBJS)\deprecateddll_dummy.obj &
        $(OBJS)\deprecateddll_prop.obj &
@@ -196,12 +197,13 @@ DEPRECATEDDLL_OBJECTS =  &
 DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__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 $(CFLAGS)
+       -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
+       -i=..\..\src\deprecated $(CFLAGS)
 DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__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 $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_deprecatedlib.pch
+       -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
+       -i=..\..\src\deprecated $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecatedlib.pch
 DEPRECATEDLIB_OBJECTS =  &
        $(OBJS)\deprecatedlib_dummy.obj &
        $(OBJS)\deprecatedlib_prop.obj &
@@ -294,7 +296,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprec
        @%create $(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc option quiet
        @%append $(OBJS)\deprecateddll.lbc name $^@
-       @%append $(OBJS)\deprecateddll.lbc option incremental
+       @%append $(OBJS)\deprecateddll.lbc option caseexact
        @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  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$(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)\deprecateddll.lbc library %i