mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-10 05:55:33 +08:00
refs #145, fixed some .pro/.pri files to new style
This commit is contained in:
@@ -20,18 +20,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
|
||||
DEFINES += USING_PCH
|
||||
}
|
||||
|
||||
# Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes,
|
||||
# then automatically adds them to the sources to compile
|
||||
# !! Make sure the plugin is available as release build and known QT_PLUGIN_PATH
|
||||
# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
|
||||
# DBUS_ADAPTORS += blackcore.contextnetwork.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextvoice.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextsettings.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextapplication.xml
|
||||
|
||||
# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
|
||||
# DBUS_INTERFACES += blackcore.contextnetwork.xml
|
||||
|
||||
DEFINES += LOG_IN_FILE
|
||||
|
||||
HEADERS += *.h
|
||||
|
||||
@@ -24,3 +24,18 @@ qdbusxml2cpp -i context_adaptor.h -a :contextnetwork_adaptor.cpp blackcore.conte
|
||||
Manually:
|
||||
<signal name="statusMessage">
|
||||
<signal name="textMessagesReceived">
|
||||
|
||||
Removed generation:
|
||||
|
||||
# Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes,
|
||||
# then automatically adds them to the sources to compile
|
||||
# !! Make sure the plugin is available as release build and known QT_PLUGIN_PATH
|
||||
# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
|
||||
# DBUS_ADAPTORS += blackcore.contextnetwork.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextvoice.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextsettings.xml
|
||||
# DBUS_ADAPTORS += blackcore.contextapplication.xml
|
||||
|
||||
# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
|
||||
# DBUS_INTERFACES += blackcore.contextnetwork.xml
|
||||
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
include (../../config.pri)
|
||||
include (../../build.pri)
|
||||
|
||||
QT += network dbus xml
|
||||
|
||||
TARGET = blacksim
|
||||
TEMPLATE = lib
|
||||
|
||||
CONFIG += staticlib c++11
|
||||
CONFIG += blackmisc
|
||||
|
||||
INCLUDEPATH += ..
|
||||
DEPENDPATH += . ..
|
||||
|
||||
LIBS += -L../../lib -lblackmisc
|
||||
|
||||
# PRECOMPILED_HEADER = stdpch.h
|
||||
precompile_header:!isEmpty(PRECOMPILED_HEADER) {
|
||||
DEFINES += USING_PCH
|
||||
@@ -26,3 +29,4 @@ SOURCES += $$PWD/fscommon/*.cpp
|
||||
|
||||
DESTDIR = ../../lib
|
||||
|
||||
include (../../libraries.pri)
|
||||
|
||||
@@ -6,6 +6,7 @@ QT += network dbus gui multimedia
|
||||
TARGET = blacksound
|
||||
TEMPLATE = lib
|
||||
CONFIG += staticlib
|
||||
CONFIG += blackmisc
|
||||
|
||||
INCLUDEPATH += ..
|
||||
DEPENDPATH += . ..
|
||||
@@ -17,8 +18,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
|
||||
|
||||
DEFINES += LOG_IN_FILE
|
||||
|
||||
LIBS += -L../../lib -lblackmisc
|
||||
|
||||
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
|
||||
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a
|
||||
|
||||
|
||||
Reference in New Issue
Block a user