Skip to content

Commit a871451

Browse files
committed
Fix Linux build process
Update to use SDL2 2.0.9 Add `XML_DEV_RANDOM` flag to expath linux build Fix compilation error in `zl-gfx`
1 parent 21006a5 commit a871451

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

cmake/cmake/third-party/expat/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ if ( BUILD_HTML )
1616
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MEMMOVE=1 " )
1717
endif ( BUILD_HTML )
1818

19+
if ( BUILD_LINUX )
20+
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MEMMOVE=1 -DXML_DEV_URANDOM" )
21+
endif ( BUILD_LINUX )
22+
1923
set ( EXPAT_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}" )
2024

2125
file ( GLOB_RECURSE EXPAT_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c" )

cmake/cmake/third-party/sdl2/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ cmake_minimum_required ( VERSION 3.0 )
22
project ( SDL2-static )
33
include(ExternalProject)
44

5-
set (SDL2_SOURCE_DIR "${MOAI_ROOT}/3rdparty/sdl2-2.0.4")
5+
set (SDL2_SOURCE_DIR "${MOAI_ROOT}/3rdparty/sdl2-2.0.9")
66
set (SDL2_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/binarydir")
77
ExternalProject_Add(sdl2
88
SOURCE_DIR "${SDL2_SOURCE_DIR}"
99
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/install" -DSDL_SHARED=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLIBC=ON
1010
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"
11-
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/sdl2-2.0.4"
11+
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/sdl2-2.0.9"
1212
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/install"
1313
)
1414

src/zl-gfx/ZLGfxDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void ZLGfxDevice::Initialize () {
124124

125125
// if framebuffer object is not in code, check to see if it's available as
126126
// an extension and remap to core function pointers if so
127-
if (( isOpenGLES == false ) && ( majorVersion < 3 )) {
127+
if (( isOpenGLES == false ) && ( sMajorVersion < 3 )) {
128128

129129
if ( glewIsSupported ( "GL_EXT_framebuffer_object" )) {
130130

0 commit comments

Comments
 (0)