check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

[wxWidgets.git] / utils / HelpGen / makefile.wat

diff --git a/utils/HelpGen/makefile.wat b/utils/HelpGen/makefile.wat
index 7c3f173dbcc0cc14f16794692476b05212cdc0ee..615dfc93dd146fa88ced2ce1fa146198d299230c 100644 (file)
--- a/utils/HelpGen/makefile.wat
+++ b/utils/HelpGen/makefile.wat
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)
+!endif

 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base


@@ -130,7 +137,7 @@ __RUNTIME_LIBS_5 =
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1

-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -d_UNICODE

 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0


@@ -150,10 +157,8 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 
 HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) &
-       -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png &
-       -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
-       $(__DLLFLAG_p) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
+       $(CXXFLAGS)

 HELPGEN_OBJECTS =  &
        $(OBJS)\HelpGen_HelpGen.obj &
        $(OBJS)\HelpGen_cjparser.obj &
 HELPGEN_OBJECTS =  &
        $(OBJS)\HelpGen_HelpGen.obj &
        $(OBJS)\HelpGen_cjparser.obj &


@@ -162,12 +167,11 @@ HELPGEN_OBJECTS =  &
        $(OBJS)\HelpGen_markup.obj &
        $(OBJS)\HelpGen_scriptbinder.obj &
        $(OBJS)\HelpGen_sourcepainter.obj &
        $(OBJS)\HelpGen_markup.obj &
        $(OBJS)\HelpGen_scriptbinder.obj &
        $(OBJS)\HelpGen_sourcepainter.obj &

-       $(OBJS)\HelpGen_srcparser.obj &
-       $(OBJS)\HelpGen_wx_extra_imps.obj
-LIBDIRNAME = &
-       .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+       $(OBJS)\HelpGen_srcparser.obj

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -202,17 +206,14 @@ $(OBJS)\HelpGen_sourcepainter.obj :  .AUTODEPEND .\src\sourcepainter.cpp
 $(OBJS)\HelpGen_srcparser.obj :  .AUTODEPEND .\src\srcparser.cpp
        $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_srcparser.obj :  .AUTODEPEND .\src\srcparser.cpp
        $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 

-$(OBJS)\HelpGen_wx_extra_imps.obj :  .AUTODEPEND .\src\wx_extra_imps.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-

 $(OBJS)\HelpGen.exe :  $(HELPGEN_OBJECTS)
        @%create $(OBJS)\HelpGen.lbc
        @%append $(OBJS)\HelpGen.lbc option quiet
        @%append $(OBJS)\HelpGen.lbc name $^@
 $(OBJS)\HelpGen.exe :  $(HELPGEN_OBJECTS)
        @%create $(OBJS)\HelpGen.lbc
        @%append $(OBJS)\HelpGen.lbc option quiet
        @%append $(OBJS)\HelpGen.lbc name $^@

-       @%append $(OBJS)\HelpGen.lbc option incremental
+       @%append $(OBJS)\HelpGen.lbc option caseexact

        @%append $(OBJS)\HelpGen.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(HELPGEN_OBJECTS)) do @%append $(OBJS)\HelpGen.lbc file %i
        @%append $(OBJS)\HelpGen.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(HELPGEN_OBJECTS)) do @%append $(OBJS)\HelpGen.lbc file %i

-       @for %i in ( $(__WXLIB_BASE_p) $(__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) do @%append $(OBJS)\HelpGen.lbc library %i
+       @for %i in ( $(__WXLIB_BASE_p)  $(__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) do @%append $(OBJS)\HelpGen.lbc library %i

        @%append $(OBJS)\HelpGen.lbc
        wlink @$(OBJS)\HelpGen.lbc
 
        @%append $(OBJS)\HelpGen.lbc
        wlink @$(OBJS)\HelpGen.lbc