added resolution option to JPEG handler (patch #833234)

[wxWidgets.git] / samples / html / helpview / makefile.wat

diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
index 2b4cf54d2f20b5f4a204388abe2f698b51ecac30..ee7a90e315072c40dfbd325b4c2050326a56fd83 100644 (file)
--- a/samples/html/helpview/makefile.wat
+++ b/samples/html/helpview/makefile.wat
@@ -109,6 +109,13 @@ __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
 !endif
+__EXCEPTIONSFLAG_7 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_7 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_7 = -xs
+!endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
@@ -137,7 +144,7 @@ __RUNTIME_LIBS_5 =
 !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
@@ -168,7 +175,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)
 HELPVIEW_OBJECTS =  &
        $(OBJS)\helpview_helpview.obj
 OBJS = &
@@ -189,7 +196,7 @@ $(OBJS)\helpview_helpview.obj :  .AUTODEPEND .\helpview.cpp
        $(CXX) -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $<
 
 $(OBJS)\helpview_helpview.res :  .AUTODEPEND .\helpview.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -209,6 +216,6 @@ $(OBJS)\helpview.exe :  $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res
        @%append $(OBJS)\helpview.lbc option caseexact
        @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i
-       @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__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)\helpview.lbc library %i
+       @for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__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)\helpview.lbc library %i
        @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res
        wlink @$(OBJS)\helpview.lbc