Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Wayland from SDL2 build; add sndio lib to target_link_librarie… #13

Open
wants to merge 1 commit into
base: pull-2.0
Choose a base branch
from
+8 −4
Open

Remove Wayland from SDL2 build; add sndio lib to target_link_librarie… #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/cmake-modules/platform-linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 " )
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" )
4 changes: 4 additions & 0 deletions cmake/hosts/host-linux-sdl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cmake/third-party/sdl2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)