X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4839ccf58de31e405cba8835f81191c28d415f8..eed8659474aaf84eb8db85060ebee455165d8137:/samples/console/makefile.wat diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index da38f6ad0b..49a018b842 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -133,22 +133,25 @@ __DLLFLAG_p = -dWXUSINGDLL !endif __WXLIB_NET_p = !ifeq MONOLITHIC 0 -__WXLIB_NET_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif __WXLIB_ODBC_p = !ifeq MONOLITHIC 0 !ifeq USE_ODBC 1 -__WXLIB_ODBC_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib +__WXLIB_ODBC_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib !endif !endif __WXLIB_BASE_p = !ifeq MONOLITHIC 0 -__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif __WXLIB_MONO_p = !ifeq MONOLITHIC 1 __WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif __LIB_TIFF_p = !ifeq USE_GUI 1 @@ -172,6 +175,7 @@ LIBDIRNAME = .\..\..\lib\wat_dll$(CFG) ### Variables: ### +WX_RELEASE_NODOT = 25 OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = &