Merge pull request #265 from kc5nra/interaction

Add interaction support to libobs and support for pumping the events/interaction in gui
This commit is contained in:
Jim
2014-09-15 16:42:19 -07:00
13 changed files with 795 additions and 2 deletions

View File

@@ -74,6 +74,7 @@ set(obs_SOURCES
obs-app.cpp
window-basic-main.cpp
window-basic-settings.cpp
window-basic-interaction.cpp
window-basic-properties.cpp
window-basic-source-select.cpp
window-license-agreement.cpp
@@ -92,6 +93,7 @@ set(obs_HEADERS
window-main.hpp
window-basic-main.hpp
window-basic-settings.hpp
window-basic-interaction.hpp
window-basic-properties.hpp
window-basic-source-select.hpp
window-license-agreement.hpp
@@ -114,6 +116,7 @@ set(obs_UI
forms/OBSBasicTransform.ui
forms/OBSBasicSettings.ui
forms/OBSBasicSourceSelect.ui
forms/OBSBasicInteraction.ui
forms/OBSBasicProperties.ui)
set(obs_QRC