[linux] - syncing Makefile for linux

- fixed warnings - fixed includes
xbmc · Jul 4, 2011 · f0d4b93 · f0d4b93
1 parent da6d440
commit f0d4b93
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/xbmc/InertialScrollingHandler.cpp b/xbmc/InertialScrollingHandler.cpp
@@ -102,12 +102,12 @@ bool CInertialScrollingHandler::ProcessInertialScroll(float frameTime)
       //CLog::Log(LOGDEBUG,"velocity: %f dec: %f time: %f", m_iFlickVelocity.y, m_inertialDeacceleration.y, absolutInertialTime);      
 
       //check if the signs are equal - which would mean we deaccelerated to long and reversed the direction
-      if( m_inertialDeacceleration.y < 0 == m_iFlickVelocity.y < 0 )
+      if( (m_inertialDeacceleration.y < 0) == (m_iFlickVelocity.y < 0) )
       {
         m_iFlickVelocity.y = 0;
       }
 
-      if( m_inertialDeacceleration.x < 0 == m_iFlickVelocity.x < 0 )
+      if( (m_inertialDeacceleration.x < 0) == (m_iFlickVelocity.x < 0) )
       {
         m_iFlickVelocity.x = 0;
       }      

diff --git a/xbmc/InertialScrollingHandler.h b/xbmc/InertialScrollingHandler.h
@@ -21,8 +21,8 @@
  *
  */
 
-#include "Geometry.h"
-#include "Key.h"
+#include "guilib/Geometry.h"
+#include "guilib/Key.h"
 
 //time for reaching velocitiy 0 in secs
 #define TIME_TO_ZERO_SPEED 1.0

diff --git a/xbmc/Makefile.in b/xbmc/Makefile.in
@@ -7,6 +7,7 @@ SRCS=Application.cpp \
      DynamicDll.cpp \
      Favourites.cpp \
      FileItem.cpp \
+     InertialScrollingHandler.cpp \
      LangInfo.cpp \
      GUIInfoManager.cpp \
      GUILargeTextureManager.cpp \