diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-21 18:02:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 19:36:06 +0200 |
| commit | 279c4de35a5e475c472128789ff11bccc29c78b3 (patch) | |
| tree | 4aa4daa86284ea387b0e40fa827307ba5f111738 /qmake/Makefile.unix | |
| parent | aeebe1db79f48eb65df707ccaf24df69afcb85e3 (diff) | |
unify c*flags in the hand-written makefiles somewhat
Change-Id: I7a7139fd71bce879b3ee4d9e26e30d2ca63da69e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 4d310d966a..29d1e7907f 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -74,16 +74,17 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge $(SOURCE_PATH)/src/corelib/global/qlogging.cpp \ $(QTSRCS) -CPPFLAGS = -g -I$(QMKSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ - -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ +CPPFLAGS = -g $(OPENSOURCE_CXXFLAGS) \ + -I$(QMKSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ + -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \ - -I$(BUILD_PATH)/src/corelib/global \ + -I$(BUILD_PATH)/src/corelib/global -DHAVE_QCONFIG_CPP \ + -I$(QMAKESPEC) \ -I$(SOURCE_PATH)/tools/shared \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ - -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ - -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS) + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ + -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) |