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 0f0265011f1ed934d4b2d37130cf6a84e0ce1551..6e6f78835cbbaaef23c55693d496fb1bd44f2244 100644 (file)
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../../build/config.wat
+!include ../../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_dll$(CFG)
+!endif
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
@@ -169,69 +176,48 @@ __deprecatedlib___depname = &
 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=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-       -i=..\..\src\deprecated\..\..\..\src\jpeg &
-       -i=..\..\src\deprecated\..\..\..\src\png &
-       -i=..\..\src\deprecated\..\..\..\src\zlib &
-       -i=..\..\src\deprecated\..\..\..\src\regex &
-       -i=..\..\src\deprecated\..\..\..\src\expat\lib &
-       -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-       -dWXMAKINGDLL_DEPRECATED $(CFLAGS)
+       -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
+       -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=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-       -i=..\..\src\deprecated\..\..\..\src\jpeg &
-       -i=..\..\src\deprecated\..\..\..\src\png &
-       -i=..\..\src\deprecated\..\..\..\src\zlib &
-       -i=..\..\src\deprecated\..\..\..\src\regex &
-       -i=..\..\src\deprecated\..\..\..\src\expat\lib &
-       -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-       -dWXMAKINGDLL_DEPRECATED $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecateddll.pch
+       -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
+       -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_deprecateddll.pch
 DEPRECATEDDLL_OBJECTS =  &
        $(OBJS)\deprecateddll_dummy.obj &
        $(OBJS)\deprecateddll_prop.obj &
        $(OBJS)\deprecateddll_propform.obj &
        $(OBJS)\deprecateddll_proplist.obj &
        $(OBJS)\deprecateddll_resource.obj &
+       $(OBJS)\deprecateddll_tbarsmpl.obj &
        $(OBJS)\deprecateddll_treelay.obj &
        $(OBJS)\deprecateddll_wxexpr.obj &
        $(OBJS)\deprecateddll_dosyacc.obj
 DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-       -i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-       -i=..\..\src\deprecated\..\..\..\src\jpeg &
-       -i=..\..\src\deprecated\..\..\..\src\png &
-       -i=..\..\src\deprecated\..\..\..\src\zlib &
-       -i=..\..\src\deprecated\..\..\..\src\regex &
-       -i=..\..\src\deprecated\..\..\..\src\expat\lib &
-       -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=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-       -i=..\..\src\deprecated\..\..\..\src\jpeg &
-       -i=..\..\src\deprecated\..\..\..\src\png &
-       -i=..\..\src\deprecated\..\..\..\src\zlib &
-       -i=..\..\src\deprecated\..\..\..\src\regex &
-       -i=..\..\src\deprecated\..\..\..\src\expat\lib &
-       -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 &
        $(OBJS)\deprecatedlib_propform.obj &
        $(OBJS)\deprecatedlib_proplist.obj &
        $(OBJS)\deprecatedlib_resource.obj &
+       $(OBJS)\deprecatedlib_tbarsmpl.obj &
        $(OBJS)\deprecatedlib_treelay.obj &
        $(OBJS)\deprecatedlib_wxexpr.obj &
        $(OBJS)\deprecatedlib_dosyacc.obj
-LIBDIRNAME = &
-       ..\..\src\deprecated\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 
 all : $(OBJS)
@@ -260,6 +246,9 @@ $(OBJS)\deprecateddll_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.
 $(OBJS)\deprecateddll_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
        $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
+$(OBJS)\deprecateddll_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
 $(OBJS)\deprecateddll_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
        $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
@@ -284,6 +273,9 @@ $(OBJS)\deprecatedlib_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.
 $(OBJS)\deprecatedlib_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
        $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
+$(OBJS)\deprecatedlib_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
 $(OBJS)\deprecatedlib_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
        $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
@@ -304,10 +296,10 @@ $(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
+       @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
        @%append $(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc system nt_dll
        wlink @$(OBJS)\deprecateddll.lbc