From 462b7f6adffb938b0f1c9fb52a5721261db3cb4f Mon Sep 17 00:00:00 2001 From: ephy Date: Sun, 25 Apr 2010 17:47:49 +0000 Subject: [PATCH] GCS/libqxt: Updated project files for windows. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@544 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/libs/libqxt/libqxt.pro | 62 ++++++++++++++++++- .../src/libs/libqxt/src/berkeley/berkeley.pro | 2 +- ground/src/libs/libqxt/src/core/core.pro | 4 +- .../src/libs/libqxt/src/designer/designer.pro | 2 +- ground/src/libs/libqxt/src/gui/gui.pro | 2 +- .../src/libs/libqxt/src/network/network.pro | 2 +- ground/src/libs/libqxt/src/sql/sql.pro | 2 +- ground/src/libs/libqxt/src/src.pro | 3 - ground/src/libs/libqxt/src/web/web.pro | 2 +- .../src/libs/libqxt/src/zeroconf/zeroconf.pro | 2 +- 10 files changed, 70 insertions(+), 13 deletions(-) delete mode 100644 ground/src/libs/libqxt/src/src.pro diff --git a/ground/src/libs/libqxt/libqxt.pro b/ground/src/libs/libqxt/libqxt.pro index bcee05aa7..9ae8b8a23 100644 --- a/ground/src/libs/libqxt/libqxt.pro +++ b/ground/src/libs/libqxt/libqxt.pro @@ -2,7 +2,65 @@ # Qxt main project file # # - TEMPLATE = subdirs -SUBDIRS = src \ + +QXT_MODULES = core + +contains( QXT_MODULES, core ){ + message( building core module ) + sub_core.subdir = src/core + SUBDIRS += sub_core +} + +contains( QXT_MODULES, gui ){ + message( building gui module ) + sub_gui.subdir = src/gui + sub_gui.depends = sub_core + SUBDIRS += sub_gui + contains( QXT_MODULES, designer ){ + sub_designer.subdir = src/designer + sub_designer.depends = sub_core sub_gui + SUBDIRS += sub_designer + } +} + +contains( QXT_MODULES, network ){ + message( building network module ) + sub_network.subdir = src/network + sub_network.depends = sub_core + SUBDIRS += sub_network +} + +contains( QXT_MODULES, sql ){ + message( building sql module ) + sub_sql.subdir = src/sql + sub_sql.depends = sub_core + SUBDIRS += sub_sql +} + +contains(DEFINES,HAVE_DB){ +contains( QXT_MODULES, berkeley ){ + message( building berkeley module ) + sub_berkeley.subdir = src/berkeley + sub_berkeley.depends = sub_core + SUBDIRS += sub_berkeley +} +} + +contains(DEFINES,HAVE_ZEROCONF){ +contains( QXT_MODULES, zeroconf ){ + message( building zeroconf module ) + sub_zeroconf.subdir = src/zeroconf + sub_zeroconf.depends = sub_network + SUBDIRS += sub_zeroconf +} +} + +contains( QXT_MODULES, web ){ + message( building web module ) + sub_web.subdir = src/web + sub_web.depends = sub_core sub_network + SUBDIRS += sub_web +} + diff --git a/ground/src/libs/libqxt/src/berkeley/berkeley.pro b/ground/src/libs/libqxt/src/berkeley/berkeley.pro index f62865408..98a56b04a 100644 --- a/ground/src/libs/libqxt/src/berkeley/berkeley.pro +++ b/ground/src/libs/libqxt/src/berkeley/berkeley.pro @@ -5,6 +5,6 @@ QXT = core CONVENIENCE += $$CLEAN_TARGET include(berkeley.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) !win32:LIBS += -ldb diff --git a/ground/src/libs/libqxt/src/core/core.pro b/ground/src/libs/libqxt/src/core/core.pro index be1574d00..94bb0cfc5 100644 --- a/ground/src/libs/libqxt/src/core/core.pro +++ b/ground/src/libs/libqxt/src/core/core.pro @@ -1,8 +1,10 @@ TEMPLATE = lib TARGET = QxtCore + DEFINES += QXTCORE_LIBRARY include(../../../../openpilotgcslibrary.pri) -DEFINES += BUILD_QXT + +DEFINES += BUILD_QXT_CORE include(core.pri) include(logengines/logengines.pri) diff --git a/ground/src/libs/libqxt/src/designer/designer.pro b/ground/src/libs/libqxt/src/designer/designer.pro index 8e8e619bd..cae0c6ac6 100644 --- a/ground/src/libs/libqxt/src/designer/designer.pro +++ b/ground/src/libs/libqxt/src/designer/designer.pro @@ -5,7 +5,7 @@ QXT = core gui CONVENIENCE += include(designer.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) CONFIG += designer plugin target.path = $$[QT_INSTALL_PLUGINS]/designer diff --git a/ground/src/libs/libqxt/src/gui/gui.pro b/ground/src/libs/libqxt/src/gui/gui.pro index b111bb07a..4084276d0 100644 --- a/ground/src/libs/libqxt/src/gui/gui.pro +++ b/ground/src/libs/libqxt/src/gui/gui.pro @@ -5,7 +5,7 @@ QXT = core CONVENIENCE += $$CLEAN_TARGET include(gui.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) contains(DEFINES,HAVE_XRANDR){ !win32:LIBS += -lXrandr diff --git a/ground/src/libs/libqxt/src/network/network.pro b/ground/src/libs/libqxt/src/network/network.pro index 7e5472639..32e8eb3eb 100644 --- a/ground/src/libs/libqxt/src/network/network.pro +++ b/ground/src/libs/libqxt/src/network/network.pro @@ -5,4 +5,4 @@ QXT = core CONVENIENCE += $$CLEAN_TARGET include(network.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) diff --git a/ground/src/libs/libqxt/src/sql/sql.pro b/ground/src/libs/libqxt/src/sql/sql.pro index 7b142d842..bf3a8f4c8 100644 --- a/ground/src/libs/libqxt/src/sql/sql.pro +++ b/ground/src/libs/libqxt/src/sql/sql.pro @@ -5,4 +5,4 @@ QXT = core CONVENIENCE += $$CLEAN_TARGET include(sql.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) diff --git a/ground/src/libs/libqxt/src/src.pro b/ground/src/libs/libqxt/src/src.pro deleted file mode 100644 index 6300dbd8b..000000000 --- a/ground/src/libs/libqxt/src/src.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = core - diff --git a/ground/src/libs/libqxt/src/web/web.pro b/ground/src/libs/libqxt/src/web/web.pro index 5e4bfda7e..96d7b7a41 100644 --- a/ground/src/libs/libqxt/src/web/web.pro +++ b/ground/src/libs/libqxt/src/web/web.pro @@ -5,4 +5,4 @@ QXT = core network CONVENIENCE += $$CLEAN_TARGET include(web.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) diff --git a/ground/src/libs/libqxt/src/zeroconf/zeroconf.pro b/ground/src/libs/libqxt/src/zeroconf/zeroconf.pro index 764627c21..baad19860 100644 --- a/ground/src/libs/libqxt/src/zeroconf/zeroconf.pro +++ b/ground/src/libs/libqxt/src/zeroconf/zeroconf.pro @@ -5,7 +5,7 @@ QXT = core network CONVENIENCE += $$CLEAN_TARGET include(zeroconf.pri) -include(../qxtbase.pri) +#include(../qxtbase.pri) unix:!macx:LIBS += -ldns_sd !contains(CONFIG,NO_AVAHI): unix:!macx:LIBS += -lavahi-client -lavahi-common