Extract compiler-specific macro definitions in a new wx/compiler.h.

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

diff --git a/samples/preferences/makefile.wat b/samples/preferences/makefile.wat
index dd54707f46d0d56d772040864afc402e414decde..1d6f507647ba3ce0553a11408a026c6cfea622b9 100644 (file)
--- a/samples/preferences/makefile.wat
+++ b/samples/preferences/makefile.wat
@@ -156,6 +156,10 @@ __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
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r

 __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 +264,7 @@ $(OBJS)\preferences.exe :  $(PREFERENCES_OBJECTS) $(OBJS)\preferences_sample.res
        @%append $(OBJS)\preferences.lbc option caseexact\r
        @%append $(OBJS)\preferences.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PREFERENCES_OBJECTS)) do @%append $(OBJS)\preferences.lbc file %i\r
        @%append $(OBJS)\preferences.lbc option caseexact\r
        @%append $(OBJS)\preferences.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(PREFERENCES_OBJECTS)) do @%append $(OBJS)\preferences.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)\preferences.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)\preferences.lbc library %i\r

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