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

Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

Browse Source 
Conflicts:
	src/blackd/blackd.pro
This commit is contained in:
Mathew Sutcliffe
2013-04-04 21:37:48 +01:00
parent 3d2fa282f3 4ca22ddf3f
commit 01cfbf2516
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -25,11 +25,7 @@ OPTION(WITH_BLACK_LIB "Build BlackBox libraries"
IF(WITH_BLACK_LIB) IF(WITH_BLACK_LIB)
OPTION(WITH_BLACK_CORE "Build Core library" ON ) OPTION(WITH_BLACK_CORE "Build Core library" ON )
OPTION(WITH_BLACK_MISC "Build Misc library" ON ) OPTION(WITH_BLACK_MISC "Build Misc library" ON )
IF(WIN32) OPTION(WITH_STATIC "With static libraries." ON )
OPTION(WITH_STATIC "With static libraries." ON )
ELSE(WIN32)
OPTION(WITH_STATIC "With static libraries." OFF)
ENDIF()
OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON) OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON)
ENDIF(WITH_BLACK_LIB) ENDIF(WITH_BLACK_LIB)
@@ -169,6 +165,10 @@ IF(MSVC)
ENDIF(MSVC11) ENDIF(MSVC11)
ADD_COMPILER_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250") ADD_COMPILER_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
ADD_DEFINITIONS(
/Zc:wchar_t- # Treat wchar_t as built-in type
)
ENDIF() ENDIF()
############### Configure checks ############### ############### Configure checks ###############

4
samples/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
ADD_SUBDIRECTORY(Logging) ADD_SUBDIRECTORY(logging)
ADD_SUBDIRECTORY(com_server) ADD_SUBDIRECTORY(com_server)
ADD_SUBDIRECTORY(com_client) ADD_SUBDIRECTORY(com_client)
ADD_SUBDIRECTORY(Geodetic2Ecef) ADD_SUBDIRECTORY(geodetic2ecef)
ADD_SUBDIRECTORY(interpolator) ADD_SUBDIRECTORY(interpolator)
ADD_SUBDIRECTORY(config) ADD_SUBDIRECTORY(config)

6
samples/geodetic2ecef/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
FILE(GLOB SRC *.cpp) FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(sample_Geodetic2Ecef ${SRC}) ADD_EXECUTABLE(sample_geodetic2ecef ${SRC})
TARGET_LINK_LIBRARIES(sample_Geodetic2Ecef blackmisc blackcore ${QT_LIBRARIES}) TARGET_LINK_LIBRARIES(sample_geodetic2ecef blackmisc blackcore ${QT_LIBRARIES})
SET_TARGET_PROPERTIES(sample_Geodetic2Ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef") SET_TARGET_PROPERTIES(sample_geodetic2ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")

2
src/blackcore/CMakeLists.txt
View File

@@ -3,6 +3,8 @@ FILE(GLOB blackcore_HEADERS *.h)
SET(blackcore_HEADERS_QOBJECT SET(blackcore_HEADERS_QOBJECT
fsd_client.h) fsd_client.h)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT}) QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT})
SOURCE_GROUP(QtGeneratedMocSrc FILES ${blackcore_HEADERS_MOC}) SOURCE_GROUP(QtGeneratedMocSrc FILES ${blackcore_HEADERS_MOC})

1
src/blackd/blackd.pro
View File

@@ -2,6 +2,7 @@ QT += core gui xml svg network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = blackd TARGET = blackd
TEMPLATE = app TEMPLATE = app

4
src/blackmisc/display.cpp
View File

@@ -9,9 +9,7 @@
#include "blackmisc/context.h" #include "blackmisc/context.h"
#include "blackmisc/display.h" #include "blackmisc/display.h"
#ifdef Q_OS_LINUX #include <errno.h>
#include <errno.h>
#endif
namespace BlackMisc namespace BlackMisc
{ {