Skip to content

Commit 7ae5144

Browse files
committed
SDL2 cmake stuff
1 parent e470e81 commit 7ae5144

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if(APPLE)
3030
SET(INCLUDE-PROJECTM-PULSEAUDIO OFF)
3131
SET(INCLUDE-PROJECTM-LIBVISUAL OFF)
3232
SET(INCLUDE-PROJECTM-TEST OFF)
33-
SET(INCLUDE-SDL ON)
33+
SET(INCLUDE-PROJECTM-SDL ON)
3434
SET(INCLUDE-NATIVE-PRESETS OFF)
3535
endif(APPLE)
3636

src/projectM-sdl/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ SET(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOU
1212

1313
# we're producing an executable called projectMSDL
1414
ADD_EXECUTABLE(projectMSDL projectM_SDL_main.cpp
15-
${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/PresetFactory.cpp
16-
${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/KeyHandler.cpp
1715
)
1816

1917
# openGL
2018
FIND_PACKAGE(OpenGL)
2119

20+
# SDL2
21+
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # has FindSDL2
22+
FIND_PACKAGE(SDL2 REQUIRED)
23+
2224
# link in projectM
2325
# i have no idea if this is correct
24-
TARGET_LINK_LIBRARIES(projectMSDL projectM ${OPENGL_LIBRARIES})
26+
TARGET_LINK_LIBRARIES(projectMSDL projectM ${OPENGL_LIBRARIES} ${SDL2_LIBRARY})
2527
SET(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
26-
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE})
28+
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL2_INCLUDE_DIR})
2729
LINK_DIRECTORIES(${PROJECTM_LINK})
2830

src/projectM-sdl/cmake_install.cmake

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Install script for directory: /Users/bobo/dev/projectm/src/projectM-sdl
2+
3+
# Set the install prefix
4+
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
5+
set(CMAKE_INSTALL_PREFIX "/usr/local")
6+
endif()
7+
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
8+
9+
# Set the install configuration name.
10+
if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
11+
if(BUILD_TYPE)
12+
string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
13+
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
14+
else()
15+
set(CMAKE_INSTALL_CONFIG_NAME "")
16+
endif()
17+
message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
18+
endif()
19+
20+
# Set the component getting installed.
21+
if(NOT CMAKE_INSTALL_COMPONENT)
22+
if(COMPONENT)
23+
message(STATUS "Install component: \"${COMPONENT}\"")
24+
set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
25+
else()
26+
set(CMAKE_INSTALL_COMPONENT)
27+
endif()
28+
endif()
29+

0 commit comments

Comments
 (0)