X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4830bb56087db30c534dc6937242b2260d0a9c8..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/samples/layout/makefile.vc diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 2f0781865c..6aa0db8f3e 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -12,7 +12,7 @@ ### Variables: ### -WX_RELEASE_NODOT = 29 +WX_RELEASE_NODOT = 30 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) @@ -319,7 +319,7 @@ __WXLIB_BASE_p = \ __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif -!if "$(MONOLITHIC)" == "1" +!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif !if "$(USE_GUI)" == "1"