X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bed99c22560c0b308e2e70af7d0e615b312dd04b..20125017a4bccd0920ee21e178950b0de0e4d63b:/samples/power/makefile.wat diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index 0eeee2e8ab..8c86bca713 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -156,6 +156,10 @@ __WXLIB_MONO_p = __WXLIB_MONO_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +__LIB_SCINTILLA_IF_MONO_p = +!ifeq MONOLITHIC 1 +__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib +!endif __LIB_TIFF_p = !ifeq USE_GUI 1 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib @@ -260,7 +264,7 @@ $(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res @%append $(OBJS)\power.lbc option caseexact @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.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) $(__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)\power.lbc library %i + @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)\power.lbc library %i @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res @for %i in () do @%append $(OBJS)\power.lbc option stack=%i wlink @$(OBJS)\power.lbc