From 681ce7cf9e0a7b3b7b044beb6aad003a16462db6 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 31 Jul 2016 19:59:56 -0700 Subject: [PATCH] building native presets working on linux basically w00t --- src/libprojectM/CMakeLists.txt | 5 +++-- src/libprojectM/MilkdropPresetFactory/CMakeLists.txt | 1 + src/libprojectM/Renderer/CMakeLists.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index b5750d077..42e43ff23 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/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) TARGET_LINK_LIBRARIES(projectM Renderer diff --git a/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt b/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt index 6b82a2e6d..4bf1193bf 100644 --- a/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt +++ b/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) diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt index e867b5374..b6f272315 100644 --- a/src/libprojectM/Renderer/CMakeLists.txt +++ b/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}