File tree 3 files changed +7
-3
lines changed
3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -16,6 +16,10 @@ if ( BUILD_HTML )
16
16
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MEMMOVE=1 " )
17
17
endif ( BUILD_HTML )
18
18
19
+ if ( BUILD_LINUX )
20
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MEMMOVE=1 -DXML_DEV_URANDOM" )
21
+ endif ( BUILD_LINUX )
22
+
19
23
set ( EXPAT_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR} " )
20
24
21
25
file ( GLOB_RECURSE EXPAT_SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /*.c" )
Original file line number Diff line number Diff line change @@ -2,13 +2,13 @@ cmake_minimum_required ( VERSION 3.0 )
2
2
project ( SDL2-static )
3
3
include (ExternalProject)
4
4
5
- set (SDL2_SOURCE_DIR "${MOAI_ROOT} /3rdparty/sdl2-2.0.4 " )
5
+ set (SDL2_SOURCE_DIR "${MOAI_ROOT} /3rdparty/sdl2-2.0.9 " )
6
6
set (SDL2_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR} /binarydir" )
7
7
ExternalProject_Add(sdl2
8
8
SOURCE_DIR "${SDL2_SOURCE_DIR} "
9
9
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} /install" -DSDL_SHARED=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLIBC=ON
10
10
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 "
12
12
INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR} /install"
13
13
)
14
14
Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ void ZLGfxDevice::Initialize () {
124
124
125
125
// if framebuffer object is not in code, check to see if it's available as
126
126
// an extension and remap to core function pointers if so
127
- if (( isOpenGLES == false ) && ( majorVersion < 3 )) {
127
+ if (( isOpenGLES == false ) && ( sMajorVersion < 3 )) {
128
128
129
129
if ( glewIsSupported ( " GL_EXT_framebuffer_object" )) {
130
130
You can’t perform that action at this time.
0 commit comments