X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b02dd12239c8a59b9a545d9fcb04974f8ad02c6b..6ae941a68cad8767173df6064e7f24d7b163de54:/samples/render/Makefile.in diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index c5416a9f97..a3376fee7d 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -50,8 +50,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.9 WX_RELEASE_NODOT = 29 -WX_VERSION = $(WX_RELEASE).4 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 +WX_VERSION = $(WX_RELEASE).5 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ @@ -75,7 +75,12 @@ RENDDLL_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@COMPILER_VERSION \ +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = \ +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \ +@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION) @COND_BUILD_debug@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ