diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 19:30:08 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-14 19:30:08 +0200 |
| commit | 98a70e0e80e82f8bb0205d106c745cfa545e21a0 (patch) | |
| tree | 8c60478bcf17e0d9ee88e19a76a280aedb35ef9a | |
| parent | 2516f604e6d6728a994d607230ff22550019634c (diff) | |
Init X11 threads on Q_OS_UNIX
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | facetracknoir/main.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c7b1389..6e5b6978 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -492,6 +492,8 @@ endif() add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-moc} ${opentrack-bin-uih} ${opentrack-bin-rcc}) if(WIN32) target_link_libraries(opentrack "${CMAKE_SOURCE_DIR}/dinput/dinput8.lib" "${CMAKE_SOURCE_DIR}/dinput/dxguid.lib" "${CMAKE_SOURCE_DIR}/dinput/strmiids.lib" winmm) + else() + target_link_libraries(opentrack X11) endif() if(MSVC) SET_TARGET_PROPERTIES(opentrack PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup") diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index bc0f973b..4dc96603 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -30,13 +30,17 @@ #include <QList> #if defined(_WIN32) -#include <windows.h> +# include <windows.h> //#pragma comment(linker, "/SUBSYSTEM:console /ENTRY:mainCRTStartup") +#elif defined(Q_OS_UNIX) +#include <X11/Xlib.h> #endif int main(int argc, char** argv) { #if defined(_WIN32) (void) timeBeginPeriod(1); +#elif defined(Q_OS_UNIX) + XInitThreads(); #endif QApplication app(argc, argv); QFont font; |