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>
This commit is contained in:
parent
c05f0a83fd
commit
c16593fd0b
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user