Cleaned up some comments, reorganized some code

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

diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat
index 6657a3af00422ddbb7590ad85c8e1aa560470c01..0cad89fdfa89e82d3a0fbc7b682c8b74f7feea03 100644 (file)
--- a/contrib/build/xrc/makefile.wat
+++ b/contrib/build/xrc/makefile.wat
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = ..\..\src\xrc\..\..\..\lib\wat_dll$(CFG)
+!endif
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
@@ -180,18 +187,15 @@ __xrclib___depname = &
 
 ### Variables: ###
 
-LIBDIRNAME = &
-       ..\..\src\xrc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 XRCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(LIBDIRNAME) &
-       -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg &
-       -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib &
-       -i=..\..\src\xrc\..\..\..\src\regex &
-       -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include &
-       -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrcdll.pch
+       $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
+       -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_xrcdll.pch
 XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_dummy.obj &
        $(OBJS)\xrcdll_xmlres.obj &
@@ -233,13 +237,9 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xmlrsall.obj
 XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(LIBDIRNAME) &
-       -i=..\..\src\xrc\..\..\..\src\tiff -i=..\..\src\xrc\..\..\..\src\jpeg &
-       -i=..\..\src\xrc\..\..\..\src\png -i=..\..\src\xrc\..\..\..\src\zlib &
-       -i=..\..\src\xrc\..\..\..\src\regex &
-       -i=..\..\src\xrc\..\..\..\src\expat\lib -i=..\..\src\xrc\..\..\include &
-       -i=..\..\src\xrc\expat\xmlparse -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_xrclib.pch
+       $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
+       -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse &
+       -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch
 XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_dummy.obj &
        $(OBJS)\xrclib_xmlres.obj &
@@ -531,7 +531,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wa
        @%create $(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc option quiet
        @%append $(OBJS)\xrcdll.lbc name $^@
-       @%append $(OBJS)\xrcdll.lbc option incremental
+       @%append $(OBJS)\xrcdll.lbc option caseexact
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i