[ 1505048 ] wxHtml rendering of underlined text

[wxWidgets.git] / samples / mfc / makefile.wat

diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat
index ff706c70810f615712daabe9790ed08d40357adb..d71c00ced5899548c61da008fc738a4e75eae2b1 100644 (file)
--- a/samples/mfc/makefile.wat
+++ b/samples/mfc/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -210,7 +210,7 @@ SETUPHDIR = &
 MFCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
 MFCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &

-       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &

        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 MFCTEST_OBJECTS =  &
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
 MFCTEST_OBJECTS =  &


@@ -240,13 +240,14 @@ $(OBJS)\mfctest.exe :  $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res
        @%append $(OBJS)\mfctest.lbc option caseexact
        @%append $(OBJS)\mfctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MFCTEST_OBJECTS)) do @%append $(OBJS)\mfctest.lbc file %i
        @%append $(OBJS)\mfctest.lbc option caseexact
        @%append $(OBJS)\mfctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MFCTEST_OBJECTS)) do @%append $(OBJS)\mfctest.lbc file %i

-       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\mfctest.lbc library %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\mfctest.lbc library %i

        @%append $(OBJS)\mfctest.lbc option resource=$(OBJS)\mfctest_mfctest.res
        @%append $(OBJS)\mfctest.lbc option resource=$(OBJS)\mfctest_mfctest.res

+       @for %i in () do @%append $(OBJS)\mfctest.lbc option stack=%i

        wlink @$(OBJS)\mfctest.lbc
 
 $(OBJS)\mfctest_mfctest.obj :  .AUTODEPEND .\mfctest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MFCTEST_CXXFLAGS) $<
 
 $(OBJS)\mfctest_mfctest.res :  .AUTODEPEND .\mfctest.rc
        wlink @$(OBJS)\mfctest.lbc
 
 $(OBJS)\mfctest_mfctest.obj :  .AUTODEPEND .\mfctest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MFCTEST_CXXFLAGS) $<
 
 $(OBJS)\mfctest_mfctest.res :  .AUTODEPEND .\mfctest.rc

-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<