Merge branch 'master' into gles

src/libprojectM/CMakeLists.txt

@@ -230,9 +230,10 @@ else(MSVC)
 endif(MSVC)
 
 # compiling on arm? relocation is gonna fail unless position-independent
-IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" )
+IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR  NOT ${DISABLE_NATIVE_PRESETS})
   SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
-ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" )
+ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR NOT ${DISABLE_NATIVE_PRESETS})
+
 
 if(BUILD_PROJECTM_STATIC)
     message(STATUS "Building static libproject")

src/libprojectM/MilkdropPresetFactory/CMakeLists.txt

@@ -13,6 +13,7 @@ SET(MilkdropPresetFactory_SOURCES
 	PerPointEqn.cpp Param.cpp
 	PerFrameEqn.cpp
 	IdlePreset.cpp
+	../PresetFactory.cpp
 )
 
 IF(NOT MSVC)

src/libprojectM/Renderer/CMakeLists.txt

@@ -26,6 +26,7 @@ SET(Renderer_SOURCES
 	VideoEcho.cpp
 	RenderItemDistanceMetric.cpp
 	RenderItemMatcher.cpp
+	../KeyHandler.cpp
 	${SOIL_SOURCES}
 )
 
@@ -48,7 +49,7 @@ else (APPLE)
 	set(COREFOUNDATION_LIBRARY )
 endif(APPLE)
 
-INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${projectM_SOURCE_DIR}/Renderer)
 
 ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
 TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES}