No changes, just update a comment about default buttons in wxMSW.

[wxWidgets.git] / samples / ribbon / makefile.wat

diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat
index 6dab5767f6b248c746f97c983fa6fec261954ee6..f9d2fc565a7f6ff61ab988d58261ef2e3d765b9e 100644 (file)
--- a/samples/ribbon/makefile.wat
+++ b/samples/ribbon/makefile.wat
@@ -38,6 +38,10 @@ PORTNAME = base
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r

+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif

 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r


@@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

 !endif\r
 __DEBUGINFO_0 =\r
 !ifeq BUILD debug\r
 !endif\r
 __DEBUGINFO_0 =\r
 !ifeq BUILD debug\r


@@ -227,8 +231,9 @@ __DLLFLAG_p = -dWXUSINGDLL
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = &
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r