Fix a crash in wxExecute() in wxMSW too.

[wxWidgets.git] / utils / screenshotgen / src / makefile.gcc

diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index bb728dd02191e469cf6c879afd404e439951f3cb..03d783af3afc2d8e33305360fd0ab282d59bad3d 100644 (file)
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\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
 SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
@@ -47,6 +48,9 @@ endif
 ifeq ($(USE_GUI),1)\r
 PORTNAME = msw\r
 endif\r
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
 endif\r
@@ -69,7 +73,7 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r