diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-03 11:30:24 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-03 11:30:24 +0400 |
| commit | d4909c56285a68562e8763f2f2fe40ec5c5297fe (patch) | |
| tree | 5251bfb940dca359b9c79bce260f03b3f01d8751 /intern/ghost | |
| parent | 02ab2b473cfad725f42a67699a7afedc90c512e3 (diff) | |
- Do not add GHOST_NDOFManager.cpp to list of sources if
NDOF is disabled in CMake.
- Added "default" section to switch in sendMotionEvent.
It's what strict gcc rules don't like much and it's
And it's good practice in general, imo.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 2180ddbe567..d7658c50a36 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -44,7 +44,6 @@ set(SRC intern/GHOST_ISystem.cpp intern/GHOST_ISystemPaths.cpp intern/GHOST_ModifierKeys.cpp - intern/GHOST_NDOFManager.cpp intern/GHOST_Path-api.cpp intern/GHOST_Path-api.cpp intern/GHOST_Rect.cpp @@ -74,12 +73,10 @@ set(SRC intern/GHOST_EventDragnDrop.h intern/GHOST_EventKey.h intern/GHOST_EventManager.h - intern/GHOST_EventNDOF.h intern/GHOST_EventString.h intern/GHOST_EventTrackpad.h intern/GHOST_EventWheel.h intern/GHOST_ModifierKeys.h - intern/GHOST_NDOFManager.h intern/GHOST_System.h intern/GHOST_SystemPaths.h intern/GHOST_TimerManager.h @@ -99,6 +96,14 @@ endif() if(WITH_INPUT_NDOF) add_definitions(-DWITH_INPUT_NDOF) + + list(APPEND SRC + intern/GHOST_NDOFManager.cpp + + intern/GHOST_EventNDOF.h + intern/GHOST_NDOFManager.h + ) + list(APPEND INC_SYS ${NDOF_INCLUDE_DIRS} ) diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index db87e1f8fc5..855e27b9964 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -452,6 +452,8 @@ bool GHOST_NDOFManager::sendMotionEvent() m_motionState = GHOST_kFinished; } break; + default: + break; } #ifdef DEBUG_NDOF_MOTION |