Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat
index 63404b8e2e59b1e49f42d91808c5f6a3bd1dfff4..3528fa5b8ab8843c7d1b5d8ac98d100d72616145 100644 (file)
--- a/samples/aui/makefile.wat
+++ b/samples/aui/makefile.wat
@@ -176,6 +176,12 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+__LIB_SCINTILLA_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+!ifeq USE_STC 1
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!endif
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
@@ -280,7 +286,7 @@ $(OBJS)\auidemo.exe :  $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res
        @%append $(OBJS)\auidemo.lbc option caseexact\r
        @%append $(OBJS)\auidemo.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i\r
-       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_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)  $(__CAIRO_LIB_p) 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 wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i\r
+       @for %i in ( $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) 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 wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i\r
        @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res\r
        @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i\r
        wlink @$(OBJS)\auidemo.lbc\r