replaced ASSERT in wxEvtHandler::ProcessPendingEvents() with a CHECK (replaces patch...

[wxWidgets.git] / samples / console / Makefile.in

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index ddc27d82ab8f94a42c4e9a2d66978107a92b6b96..7f774a0546a73f248bcfebb5ca52defa27620095 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -54,9 +54,9 @@ CONSOLE_OBJECTS =  \
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_MONOLITHIC_0@__WXLIB_NET_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_MONOLITHIC_0@__WXLIB_NET_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)

-COND_MONOLITHIC_0___WXLIB_ODBC_p = \
+COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \

        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)

-@COND_MONOLITHIC_0@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0___WXLIB_ODBC_p)
+@COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)

 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \