X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4839ccf58de31e405cba8835f81191c28d415f8..a8d08dbd459c1b7be9c1d82d9a78a32ae2730d86:/samples/listbox/makefile.wat?ds=sidebyside diff --git a/samples/listbox/makefile.wat b/samples/listbox/makefile.wat index 3fc7366229..f564885d2d 100644 --- a/samples/listbox/makefile.wat +++ b/samples/listbox/makefile.wat @@ -113,16 +113,17 @@ __EXCEPTIONSFLAG_7 = -xs __WXLIB_CORE_p = !ifeq MONOLITHIC 0 __WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !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 @@ -167,6 +168,7 @@ __DLLFLAG_p = -dWXUSINGDLL ### Variables: ### +WX_RELEASE_NODOT = 25 OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & @@ -174,7 +176,7 @@ SETUPHDIR = & LISTBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & - $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) + -dNOPCH $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = & $(OBJS)\listbox_lboxtest.obj