diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /qmake/Makefile.win32 | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 080662f772..f023dc9e3f 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -53,7 +53,6 @@ CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = ole32.lib advapi32.lib shell32.lib -LINKQMAKE = $(LINKER) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = qmake.pdb qmake.ilk #qmake code @@ -132,11 +131,10 @@ QTOBJS= \ qjsonobject.obj \ qjsonvalue.obj -first all: qmake.exe +first all: $(BUILD_PATH)\bin\qmake.exe -qmake.exe: $(OBJS) $(QTOBJS) - $(LINKQMAKE) $(PCH_OBJECT) - -copy qmake.exe $(BUILD_PATH)\bin\qmake.exe +$(BUILD_PATH)\bin\qmake.exe: $(OBJS) $(QTOBJS) + $(LINKER) $(LFLAGS) /OUT:$(BUILD_PATH)\bin\qmake.exe $(OBJS) $(QTOBJS) $(PCH_OBJECT) $(LIBS) clean:: -del $(QTOBJS) @@ -148,7 +146,6 @@ clean:: -del qmake.tds distclean:: clean - -del qmake.exe -del $(BUILD_PATH)\bin\qmake.exe -del Makefile |