diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-07 15:59:22 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-15 22:44:31 +0000 |
| commit | c16593fd0b719afc7b88ae02cc40614db8045719 (patch) | |
| tree | f33f860bed4a723e5e92d248cb461c28e58b57bd /qmake/Makefile.win32 | |
| parent | c05f0a83fdb4823604d76f61bb884e206887e704 (diff) | |
build qmake.exe directly in bin/
so far, qmake.exe was built in qmake/ and then copied to bin/, with
possible errors in the second step ignored. this made no sense.
this unifies the nmake makefile with the unix one; compare 46e51ce1d.
Change-Id: Ieb9c7cd46f0be0501d17e297808ac1cdad1b3c4a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
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 5db8b04aa0..3e67632939 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 @@ -130,11 +129,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) @@ -146,7 +144,6 @@ clean:: -del qmake.tds distclean:: clean - -del qmake.exe -del $(BUILD_PATH)\bin\qmake.exe -del Makefile |