From a421817723a2b805183cf130eaf9c1cc56abc161 Mon Sep 17 00:00:00 2001 From: Jay Vaughan Date: Thu, 19 Oct 2017 13:38:23 +0200 Subject: [PATCH] Remove Wayland from SDL2 build; add sndio lib to target_link_libraries for SDL2 build on Linux --- cmake/cmake-modules/platform-linux.cmake | 4 ++-- cmake/hosts/host-linux-sdl/CMakeLists.txt | 4 ++++ cmake/third-party/sdl2/CMakeLists.txt | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/cmake-modules/platform-linux.cmake b/cmake/cmake-modules/platform-linux.cmake index 55b93fc..f7fdbaa 100644 --- a/cmake/cmake-modules/platform-linux.cmake +++ b/cmake/cmake-modules/platform-linux.cmake @@ -1,3 +1,3 @@ #find_package ( OpenGL REQUIRED ) - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPOSIX -DNDEBUG -DHAVE_MEMMOVE" ) - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DPOSIX " ) \ No newline at end of file + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPOSIX -DNDEBUG -DHAVE_MEMMOVE -DVIDEO_WAYLAND=OFF" ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DPOSIX -DVIDEO_WAYLAND=OFF" ) diff --git a/cmake/hosts/host-linux-sdl/CMakeLists.txt b/cmake/hosts/host-linux-sdl/CMakeLists.txt index 90bcbf0..ea4a1f4 100644 --- a/cmake/hosts/host-linux-sdl/CMakeLists.txt +++ b/cmake/hosts/host-linux-sdl/CMakeLists.txt @@ -11,7 +11,11 @@ set(MOAI_ROOT ${MOAI_SDK_HOME} ) get_filename_component(MOAI_ROOT "${MOAI_ROOT}" ABSOLUTE) + #set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOAI_OS_LINUX " ) +set ( VIDEO_WAYLAND "OFF" ) +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVIDEO_WAYLAND=OFF " ) +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVIDEO_WAYLAND=OFF " ) if (LIB_PATH) get_filename_component(LIB_PATH ${LIB_PATH} ABSOLUTE) diff --git a/cmake/third-party/sdl2/CMakeLists.txt b/cmake/third-party/sdl2/CMakeLists.txt index 077a075..86739f2 100644 --- a/cmake/third-party/sdl2/CMakeLists.txt +++ b/cmake/third-party/sdl2/CMakeLists.txt @@ -6,7 +6,7 @@ set (SDL2_SOURCE_DIR "${MOAI_ROOT}/3rdparty/sdl2-2.0.4") set (SDL2_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/binarydir") ExternalProject_Add(sdl2 SOURCE_DIR "${SDL2_SOURCE_DIR}" - CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/install" -DSDL_SHARED=OFF + CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/install" -DSDL_SHARED=OFF -DVIDEO_WAYLAND=OFF CMAKE_CACHE_ARGS "-DSDL2_SOURCE_DIR:string=${SDL2_SOURCE_DIR}" "-DSDL2_BINARY_DIR:string=${SDL2_BINARY_DIR}" "-DSDL_STATIC:bool=on" "-DSDL_SHARED:bool=off" PREFIX "${CMAKE_CURRENT_BINARY_DIR}/sdl2-2.0.4" INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install" @@ -29,7 +29,7 @@ add_library(SDL2-static INTERFACE) install(FILES ${install_dir}/lib/libSDL2.a DESTINATION lib ) #todo install headers too :) target_include_directories(SDL2-static INTERFACE "${SDL2_SOURCE_DIR}/include_moai" "${SDL2_SOURCE_DIR}/include" ) -target_link_libraries(SDL2-static INTERFACE SDL2-static-imp ) +target_link_libraries(SDL2-static INTERFACE SDL2-static-imp sndio) install(TARGETS SDL2-static EXPORT libmoai ARCHIVE DESTINATION lib)