X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51ec29ea5d1d1093bafbae27a8483211a90d9659..bfa78c63b9045c2a594ca6f04dc26a70c21f5f42:/utils/emulator/src/makefile.gcc diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index 05ab76ea3d..f2e7289a99 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ @@ -43,6 +44,9 @@ endif ifeq ($(USE_GUI),1) PORTNAME = msw endif +ifeq ($(OFFICIAL_BUILD),1) +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +endif ifeq ($(BUILD),debug) WXDEBUGFLAG = d endif