Fix wrong in wxListCtrl::SetItemColumnImage() in r74716.

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

diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat
index a83bff099fc891e24ae1df6824b44fc38395d638..68b6939531f8b5b1c43138f6911d36a57f0c7c72 100644 (file)
--- a/samples/popup/makefile.wat
+++ b/samples/popup/makefile.wat
@@ -156,6 +156,12 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __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
 __LIB_TIFF_p =\r
 !ifeq USE_GUI 1\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r


@@ -260,7 +266,7 @@ $(OBJS)\popup.exe :  $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
        @%append $(OBJS)\popup.lbc option caseexact\r
        @%append $(OBJS)\popup.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i\r
        @%append $(OBJS)\popup.lbc option caseexact\r
        @%append $(OBJS)\popup.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i\r

-       @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)  $(__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)\popup.lbc library %i\r
+       @for %i in ( $(__WXLIB_CORE_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)\popup.lbc library %i\r

        @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res\r
        @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i\r
        wlink @$(OBJS)\popup.lbc\r
        @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res\r
        @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i\r
        wlink @$(OBJS)\popup.lbc\r