diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-02-02 12:31:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 10:35:06 +0100 |
| commit | 1a0924dfc008b60b98bc921a3e64c3a920158b60 (patch) | |
| tree | 232ba1bfd0d66dc42329fe90d55f6b57f158b290 /qmake/Makefile.win32 | |
| parent | 5ec342fefdb00406d3bf6f3943d4b235b9094cc9 (diff) | |
Unify win32-g++ and Unix qmake Makefiles.
Replace the old sed / template @FOO@ method with echo.
Enable MSYS bash to build qmake.exe
Use qmake/Makefile.unix for all win32-g++ builds.
Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 222acfa9a6..63cdf50563 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -42,7 +42,7 @@ CFLAGS_BARE = -c -Fo./ \ -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 \ -DUNICODE -CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) +CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) $(EXTRA_CPPFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) CXXFLAGS = $(CFLAGS) @@ -66,10 +66,6 @@ OBJS = project.obj main.obj ioutils.obj proitems.obj \ msvc_objectmodel.obj msbuild_objectmodel.obj registry.obj \ gbuild.obj cesdkhandler.obj -!IFDEF QMAKE_OPENSOURCE_EDITION -CFLAGS = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION -!ENDIF - #qt code QTOBJS= \ qbitarray.obj \ |