Revert "using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere"

[wxWidgets.git] / samples / htlbox / makefile.vc

diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index e0fcc704280b738e15c2ba3439770ffedf91a268..a63e482cfd8272c58f8e419e9650bdea68836255 100644 (file)
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -12,7 +12,7 @@
 \r
 ### Variables: ###\r
 \r
-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
        $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)\r
@@ -323,7 +323,7 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-!if "$(MONOLITHIC)" == "1"\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"\r
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r