From 02883e156482e124216459ded9e8d50f6e8b7dcf Mon Sep 17 00:00:00 2001 From: Yantao Xie Date: Mon, 30 Mar 2015 18:01:54 +0800 Subject: [PATCH 1/3] Missing including a head file: Foundation/NSValue.h. --- src/qt-gui/osx-configuration.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt-gui/osx-configuration.mm b/src/qt-gui/osx-configuration.mm index 2e3e1f6..4d841f5 100644 --- a/src/qt-gui/osx-configuration.mm +++ b/src/qt-gui/osx-configuration.mm @@ -19,6 +19,7 @@ #include #include +#include #include #include #include From 4f878b4b7d8ed2f8b3eeadd79fcdcbf9dba1b83c Mon Sep 17 00:00:00 2001 From: Yantao Xie Date: Mon, 30 Mar 2015 18:03:11 +0800 Subject: [PATCH 2/3] Fix a character case error. --- src/qt-gui/gui/worker-thread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt-gui/gui/worker-thread.cpp b/src/qt-gui/gui/worker-thread.cpp index 880565d..f420753 100644 --- a/src/qt-gui/gui/worker-thread.cpp +++ b/src/qt-gui/gui/worker-thread.cpp @@ -24,7 +24,7 @@ #include #include -#include "avatar/avatar.hpp" +#include "avatar/Avatar.hpp" #include "gui/avatar.hpp" #include "configuration.hpp" From 5b42c0a49a671d3782112a181241f0965f7dc96f Mon Sep 17 00:00:00 2001 From: Yantao Xie Date: Mon, 30 Mar 2015 18:09:48 +0800 Subject: [PATCH 3/3] Make qt-gui build successfully with GNUStep on linux. --- src/qt-gui/CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/qt-gui/CMakeLists.txt b/src/qt-gui/CMakeLists.txt index 8ddb0a4..dd84111 100644 --- a/src/qt-gui/CMakeLists.txt +++ b/src/qt-gui/CMakeLists.txt @@ -36,8 +36,20 @@ SET(MOC_HEADERS QT4_WRAP_CPP(MOC_SRCS ${MOC_HEADERS}) INCLUDE_DIRECTORIES(".") -set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS -ObjC++) - +IF(UNIX AND NOT APPLE) + INCLUDE_DIRECTORIES(/usr/local/include/GNUstep /usr/include/GNUstep) + EXECUTE_PROCESS(COMMAND gnustep-config --objc-flags + OUTPUT_VARIABLE GnuStep_FLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND gnustep-config --base-libs + OUTPUT_VARIABLE GnuStep_LINK_FLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REPLACE "\n" "" GnuStep_FLAGS ${GnuStep_FLAGS}) + STRING(REPLACE "\n" "" GnuStep_LINK_FLAGS ${GnuStep_LINK_FLAGS}) + set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS "${GnuStep_FLAGS}") +ELSE() + set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS -ObjC++) +ENDIF() add_executable(demo-application main.cpp @@ -65,6 +77,10 @@ ADD_EXECUTABLE(${BundleName} MACOSX_BUNDLE ${MOC_SRCS} ${EXTRA_SRC} ) +IF(UNIX AND NOT APPLE) + SET_TARGET_PROPERTIES(${BundleName} PROPERTIES + LINK_FLAGS "${GnuStep_LINK_FLAGS}") +ENDIF() TARGET_LINK_LIBRARIES(${BundleName} ${LIBS} ${QT_LIBRARIES} clmTracker avatarAnim ${EXTRA_LIBS})