Now with 'make -j' support

This commit is contained in:
Thorvald Natvig 2011-05-15 23:45:39 +02:00
parent 2dad2795bd
commit f7cc6e7ade
2 changed files with 21 additions and 8 deletions

View File

@ -7,14 +7,20 @@ DEFINES *= MUMBLE_VERSION_STRING=$$VERSION
INCLUDEPATH += $$PWD .
VPATH += $$PWD
HEADERS *= ACL.h Channel.h CryptState.h Connection.h Group.h User.h Net.h OSInfo.h Timer.h SSL.h Version.h
SOURCES *= Mumble.pb.cc ACL.cpp Group.cpp Channel.cpp Connection.cpp User.cpp Timer.cpp CryptState.cpp OSInfo.cpp Net.cpp SSL.cpp Version.cpp
SOURCES *= ACL.cpp Group.cpp Channel.cpp Connection.cpp User.cpp Timer.cpp CryptState.cpp OSInfo.cpp Net.cpp SSL.cpp Version.cpp
PROTOBUF *= ../Mumble.proto
pbh.output = ${QMAKE_FILE_BASE}.pb.h
pbh.depends = ${QMAKE_FILE_BASE}.pb.cc
pbh.commands = @true
pbh.input = PROTOBUF
pbh.CONFIG *= no_link explicit_dependencies
pb.output = ${QMAKE_FILE_BASE}.pb.cc
pb.clean = ${QMAKE_FILE_OUT} ${QMAKE_FILE_BASE}.pb.h
pb.commands = protoc --cpp_out=. -I. -I.. ${QMAKE_FILE_NAME}
pb.input = PROTOBUF
pb.CONFIG *= no_link
pb.CONFIG *= no_link explicit_dependencies
pb.variable_out = SOURCES
CONFIG(packaged) {
MUMDEFVER = $$find(DEFINES, "MUMBLE_VERSION=")
@ -50,7 +56,7 @@ unix {
}
}
QMAKE_EXTRA_COMPILERS *= pb
QMAKE_EXTRA_COMPILERS *= pb pbh
CONFIG(debug, debug|release) {
CONFIG += console

View File

@ -66,19 +66,26 @@ dbus {
ice {
SLICEFILES = Murmur.ice
slice.output = ${QMAKE_FILE_BASE}.cpp
slice.clean = ${QMAKE_FILE_OUT} ${QMAKE_FILE_BASE}.h
win32 {
slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
} else {
slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ ${QMAKE_FILE_NAME}
}
slice.input = SLICEFILES
slice.CONFIG *= no_link
slice.CONFIG *= no_link explicit_dependencies
slice.variable_out = SOURCES
QMAKE_EXTRA_COMPILERS *= slice
sliceh.output = ${QMAKE_FILE_BASE}.h
sliceh.depends = ${QMAKE_FILE_BASE}.cpp
sliceh.commands = @true
sliceh.input = SLICEFILES
sliceh.config = no_link explicit_dependencies
SOURCES *= Murmur.cpp MurmurIce.cpp
QMAKE_EXTRA_COMPILERS *= slice sliceh
SOURCES *= MurmurIce.cpp
HEADERS *= MurmurIce.h
win32:CONFIG(debug, debug|release) {
LIBS *= -lIceD -lIceUtilD