projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for wxAuiNotebook to XRC.
[wxWidgets.git]
/
samples
/
erase
/
makefile.gcc
diff --git
a/samples/erase/makefile.gcc
b/samples/erase/makefile.gcc
index e7f4bf04b8b715e87907f8af30bbc5e4590e71e2..86bd63b23a9d5300da7408e7ca44c79a39566ad2 100644
(file)
--- a/
samples/erase/makefile.gcc
+++ b/
samples/erase/makefile.gcc
@@
-16,8
+16,9
@@
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
\r
COMPILER_PREFIX = gcc
\r
OBJS = \
\r
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
ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
\r
SETUPHDIR = \
\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
\r
ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
\r
@@
-43,6
+44,9
@@
endif
ifeq ($(USE_GUI),1)
\r
PORTNAME = msw
\r
endif
\r
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
ifeq ($(BUILD),debug)
\r
WXDEBUGFLAG = d
\r
endif
\r