[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38971] trunk/blender/intern/ghost: - Do not add GHOST_NDOFManager.cpp to list of sources if

[Sergey Sharybin]

Revision: 38971
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38971
Author:   nazgul
Date:     2011-08-03 07:30:24 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/CMakeLists.txt
    trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp

Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt   2011-08-03 07:20:07 UTC (rev 
38970)
+++ trunk/blender/intern/ghost/CMakeLists.txt   2011-08-03 07:30:24 UTC (rev 
38971)
@@ -44,7 +44,6 @@
        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 @@
        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 @@
 
 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}
        )

Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp     2011-08-03 
07:20:07 UTC (rev 38970)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp     2011-08-03 
07:30:24 UTC (rev 38971)
@@ -452,6 +452,8 @@
                                m_motionState = GHOST_kFinished;
                        }
                        break;
+               default:
+                       break;
        }
 
 #ifdef DEBUG_NDOF_MOTION

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs