From 8cbff262d1deda5743d3cb1b0259bf856c166ebc Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 15 Jun 2014 19:39:28 +0200 Subject: [PATCH] refs #256 Update CProject and project files to reflect BlackInput --- samples/blackcore/sample_blackcore.pro | 8 +++++--- samples/blackgui/sample_blackgui.pro | 8 +++++--- samples/blackgui2/sample_blackgui2.pro | 8 +++++--- src/blackmisc/project.cpp | 10 ++++++++++ src/blackmisc/project.h | 3 +++ 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/samples/blackcore/sample_blackcore.pro b/samples/blackcore/sample_blackcore.pro index 74157402f..05c5cf3ad 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/samples/blackcore/sample_blackcore.pro @@ -12,18 +12,20 @@ CONFIG += console CONFIG -= app_bundle CONFIG += blackmisc blacksound blackinput blackcore blacksim -DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore ../../src/blacksim +DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore ../../src/blacksim ../../src/blackinput INCLUDEPATH += . ../../src win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blacksound.lib \ ../../lib/blackcore.lib \ - ../../lib/blacksim.lib + ../../lib/blacksim.lib \ + ../../lib/blackinput.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblacksound.a \ ../../lib/libblackcore.a \ - ../../lib/libblacksim.a + ../../lib/libblacksim.a \ + ../../lib/libblackinput.a DESTDIR = ../../bin diff --git a/samples/blackgui/sample_blackgui.pro b/samples/blackgui/sample_blackgui.pro index b8be66206..7b7cca3d9 100644 --- a/samples/blackgui/sample_blackgui.pro +++ b/samples/blackgui/sample_blackgui.pro @@ -12,7 +12,7 @@ HEADERS += *.h FORMS += *.ui CONFIG += blackmisc blacksound blackinput blackcore blackgui blacksim -DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blacksim ../../src/blackcore +DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blacksim ../../src/blackcore ../../src/blackinput INCLUDEPATH += . ../../src DESTDIR = ../../bin @@ -21,13 +21,15 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackgui.lib \ ../../lib/blacksim.lib \ ../../lib/blacksound.lib \ - ../../lib/blackcore.lib + ../../lib/blackcore.lib \ + ../../lib/blackinput.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackgui.a \ ../../lib/libblacksim.a \ ../../lib/libblacksound.a \ - ../../lib/libblackcore.a + ../../lib/libblackcore.a \ + ../../lib/libblackinput.a OTHER_FILES += *.qss diff --git a/samples/blackgui2/sample_blackgui2.pro b/samples/blackgui2/sample_blackgui2.pro index 2ad01a205..8f5af7d50 100644 --- a/samples/blackgui2/sample_blackgui2.pro +++ b/samples/blackgui2/sample_blackgui2.pro @@ -12,7 +12,7 @@ HEADERS += *.h FORMS += *.ui CONFIG += blackmisc blacksound blackcore blackgui blacksim -DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blacksim ../../src/blackcore +DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blacksim ../../src/blackcore ../../src/blackinput INCLUDEPATH += . ../../src DESTDIR = ../../bin @@ -21,13 +21,15 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackgui.lib \ ../../lib/blacksim.lib \ ../../lib/blacksound.lib \ - ../../lib/blackcore.lib + ../../lib/blackcore.lib \ + ../../lib/blackinput.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackgui.a \ ../../lib/libblacksim.a \ ../../lib/libblacksound.a \ - ../../lib/libblackcore.a + ../../lib/libblackcore.a \ + ../../lib/libblackinput.a OTHER_FILES += *.qss diff --git a/src/blackmisc/project.cpp b/src/blackmisc/project.cpp index b96b8c7ff..6014f38b6 100644 --- a/src/blackmisc/project.cpp +++ b/src/blackmisc/project.cpp @@ -26,6 +26,15 @@ namespace BlackMisc #endif } + bool CProject::isCompiledWithBlackInput() + { +#ifdef WITH_BLACKINPUT + return true; +#else + return false; +#endif + } + bool CProject::isCompiledWithFsxSupport() { #ifdef WITH_FSX @@ -66,6 +75,7 @@ namespace BlackMisc static QStringList sl; if (isCompiledWithBlackCore()) sl << "BlackCore"; if (isCompiledWithBlackSound()) sl << "BlackSound"; + if (isCompiledWithBlackInput()) sl << "BlackInput"; if (isCompiledWithGui()) sl << "BlackGui"; if (isCompiledWithFsxSupport()) sl << "FSX"; if (isCompiledWithXPlaneSupport()) sl << "XPlane"; diff --git a/src/blackmisc/project.h b/src/blackmisc/project.h index 9f608b5e4..74a1e2e22 100644 --- a/src/blackmisc/project.h +++ b/src/blackmisc/project.h @@ -18,6 +18,9 @@ namespace BlackMisc //! with BlackSound? static bool isCompiledWithBlackSound(); + //! with BlackInput? + static bool isCompiledWithBlackInput(); + //! with FSX support? static bool isCompiledWithFsxSupport();