From a2e7c9b75c2b81c754d0e74aad95512750587516 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 13 Aug 2014 14:53:26 -0700 Subject: [PATCH] Update build for speechRecognizer --- interface/CMakeLists.txt | 11 +++++++++-- interface/src/Application.cpp | 2 ++ interface/src/Menu.h | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 86d818af6d..1a152e4707 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -46,13 +46,20 @@ configure_file(InterfaceConfig.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceCon configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVersion.h") # grab the implementation and header files from src dirs -file(GLOB INTERFACE_OBJCPP_SRCS src/*.mm) file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) foreach(SUBDIR avatar devices renderer ui starfield location scripting voxels particles models) file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h) set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}") endforeach(SUBDIR) +# grab .mm files for OSX +if (APPLE) + file(GLOB INTERFACE_OBJCPP_SRCS src/SpeechRecognizer.mm) + set(INTERFACE_SRCS ${INTERFACE_SRCS} ${INTERFACE_OBJCPP_SRCS}) +else () + list(REMOVE_ITEM "src/SpeechRecognizer.h") +endif () + find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools) # grab the ui files in resources/ui @@ -96,7 +103,7 @@ if (APPLE) endif() # create the executable, make it a bundle on OS X -add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${INTERFACE_OBJCPP_SRCS} ${QM}) +add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM}) # link in the hifi shared library include(${MACRO_DIR}/LinkHifiLibrary.cmake) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 87f63c4b78..f303cc1c5b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3659,7 +3659,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript scriptEngine->registerGlobalObject("Camera", cameraScriptable); connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater())); +#ifdef Q_OS_MAC scriptEngine->registerGlobalObject("SpeechRecognizer", Menu::getInstance()->getSpeechRecognizer()); +#endif ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface(); scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 9f43898214..75371230ef 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -22,7 +22,10 @@ #include #include #include + +#ifdef Q_OS_MAC #include "SpeechRecognizer.h" +#endif #include "location/LocationManager.h" #include "ui/PreferencesDialog.h"