1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build qmake.exe directly in bin/

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2016-11-07 15:59:22 +01:00
parent c05f0a83fd
commit c16593fd0b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/Makefile.win32
View File

@ -53,7 +53,6 @@ CXXFLAGS = $(CFLAGS)
LFLAGS = LFLAGS =
LIBS = ole32.lib advapi32.lib shell32.lib LIBS = ole32.lib advapi32.lib shell32.lib
LINKQMAKE = $(LINKER) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
ADDCLEAN = qmake.pdb qmake.ilk ADDCLEAN = qmake.pdb qmake.ilk
#qmake code #qmake code
@ -130,11 +129,10 @@ QTOBJS= \
qjsonobject.obj \ qjsonobject.obj \
qjsonvalue.obj qjsonvalue.obj
first all: qmake.exe first all: $(BUILD_PATH)\bin\qmake.exe
qmake.exe: $(OBJS) $(QTOBJS) $(BUILD_PATH)\bin\qmake.exe: $(OBJS) $(QTOBJS)
$(LINKQMAKE) $(PCH_OBJECT) $(LINKER) $(LFLAGS) /OUT:$(BUILD_PATH)\bin\qmake.exe $(OBJS) $(QTOBJS) $(PCH_OBJECT) $(LIBS)
-copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
clean:: clean::
-del $(QTOBJS) -del $(QTOBJS)
@ -146,7 +144,6 @@ clean::
-del qmake.tds -del qmake.tds
distclean:: clean distclean:: clean
-del qmake.exe
-del $(BUILD_PATH)\bin\qmake.exe -del $(BUILD_PATH)\bin\qmake.exe
-del Makefile -del Makefile