flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #256 Update CProject and project files to reflect BlackInput

Browse Source
This commit is contained in:
Roland Winklmeier
2014-06-15 19:39:28 +02:00
parent a131e8c91c
commit 8cbff262d1
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/blackcore/sample_blackcore.pro
View File

@@ -12,18 +12,20 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG += blackmisc blacksound blackinput blackcore blacksim 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 INCLUDEPATH += . ../../src
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blacksound.lib \ ../../lib/blacksound.lib \
../../lib/blackcore.lib \ ../../lib/blackcore.lib \
../../lib/blacksim.lib ../../lib/blacksim.lib \
../../lib/blackinput.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblacksound.a \ ../../lib/libblacksound.a \
../../lib/libblackcore.a \ ../../lib/libblackcore.a \
../../lib/libblacksim.a ../../lib/libblacksim.a \
../../lib/libblackinput.a
DESTDIR = ../../bin DESTDIR = ../../bin

8
samples/blackgui/sample_blackgui.pro
View File

@@ -12,7 +12,7 @@ HEADERS += *.h
FORMS += *.ui FORMS += *.ui
CONFIG += blackmisc blacksound blackinput blackcore blackgui blacksim 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 INCLUDEPATH += . ../../src
DESTDIR = ../../bin DESTDIR = ../../bin
@@ -21,13 +21,15 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blackgui.lib \ ../../lib/blackgui.lib \
../../lib/blacksim.lib \ ../../lib/blacksim.lib \
../../lib/blacksound.lib \ ../../lib/blacksound.lib \
../../lib/blackcore.lib ../../lib/blackcore.lib \
../../lib/blackinput.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackgui.a \ ../../lib/libblackgui.a \
../../lib/libblacksim.a \ ../../lib/libblacksim.a \
../../lib/libblacksound.a \ ../../lib/libblacksound.a \
../../lib/libblackcore.a ../../lib/libblackcore.a \
../../lib/libblackinput.a
OTHER_FILES += *.qss OTHER_FILES += *.qss

8
samples/blackgui2/sample_blackgui2.pro
View File

@@ -12,7 +12,7 @@ HEADERS += *.h
FORMS += *.ui FORMS += *.ui
CONFIG += blackmisc blacksound blackcore blackgui blacksim 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 INCLUDEPATH += . ../../src
DESTDIR = ../../bin DESTDIR = ../../bin
@@ -21,13 +21,15 @@ win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blackgui.lib \ ../../lib/blackgui.lib \
../../lib/blacksim.lib \ ../../lib/blacksim.lib \
../../lib/blacksound.lib \ ../../lib/blacksound.lib \
../../lib/blackcore.lib ../../lib/blackcore.lib \
../../lib/blackinput.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackgui.a \ ../../lib/libblackgui.a \
../../lib/libblacksim.a \ ../../lib/libblacksim.a \
../../lib/libblacksound.a \ ../../lib/libblacksound.a \
../../lib/libblackcore.a ../../lib/libblackcore.a \
../../lib/libblackinput.a
OTHER_FILES += *.qss OTHER_FILES += *.qss

10
src/blackmisc/project.cpp
View File

@@ -26,6 +26,15 @@ namespace BlackMisc
#endif #endif
} }
bool CProject::isCompiledWithBlackInput()
{
#ifdef WITH_BLACKINPUT
return true;
#else
return false;
#endif
}
bool CProject::isCompiledWithFsxSupport() bool CProject::isCompiledWithFsxSupport()
{ {
#ifdef WITH_FSX #ifdef WITH_FSX
@@ -66,6 +75,7 @@ namespace BlackMisc
static QStringList sl; static QStringList sl;
if (isCompiledWithBlackCore()) sl << "BlackCore"; if (isCompiledWithBlackCore()) sl << "BlackCore";
if (isCompiledWithBlackSound()) sl << "BlackSound"; if (isCompiledWithBlackSound()) sl << "BlackSound";
if (isCompiledWithBlackInput()) sl << "BlackInput";
if (isCompiledWithGui()) sl << "BlackGui"; if (isCompiledWithGui()) sl << "BlackGui";
if (isCompiledWithFsxSupport()) sl << "FSX"; if (isCompiledWithFsxSupport()) sl << "FSX";
if (isCompiledWithXPlaneSupport()) sl << "XPlane"; if (isCompiledWithXPlaneSupport()) sl << "XPlane";

3
src/blackmisc/project.h
View File

@@ -18,6 +18,9 @@ namespace BlackMisc
//! with BlackSound? //! with BlackSound?
static bool isCompiledWithBlackSound(); static bool isCompiledWithBlackSound();
//! with BlackInput?
static bool isCompiledWithBlackInput();
//! with FSX support? //! with FSX support?
static bool isCompiledWithFsxSupport(); static bool isCompiledWithFsxSupport();