dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SDL2.0.8 update

This commit is contained in:
nesbox 2018-09-04 23:04:18 +03:00
parent 3fbe6398ba
commit ae2f23a1d5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rd-party

@ -1 +1 @@
Subproject commit 856f3bd9187d730df35e08fa2d4ce119c8afc50b Subproject commit 705e89f2f6b4771ca33eadcef8801bcb49ec9cf0

10
CMakeLists.txt
View File

@ -192,7 +192,7 @@ if(NOT EMSCRIPTEN)
endif() endif()
set(SDL_SHARED_ENABLED_BY_DEFAULT OFF) set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
add_subdirectory(3rd-party/SDL2-2.0.7) add_subdirectory(3rd-party/SDL2-2.0.8)
endif() endif()
@ -212,7 +212,7 @@ if(NOT EMSCRIPTEN)
add_executable(sdl-renderer ${EXAMPLE_SRC}) add_executable(sdl-renderer ${EXAMPLE_SRC})
endif() endif()
target_include_directories(sdl-renderer PRIVATE 3rd-party/SDL2-2.0.7/include) target_include_directories(sdl-renderer PRIVATE 3rd-party/SDL2-2.0.8/include)
target_include_directories(sdl-renderer PRIVATE include) target_include_directories(sdl-renderer PRIVATE include)
target_include_directories(sdl-renderer PRIVATE src) target_include_directories(sdl-renderer PRIVATE src)
@ -260,7 +260,7 @@ target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/glew)
target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/glew/GL) target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/glew/GL)
target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/stb_image) target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/stb_image)
target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/stb_image_write) target_include_directories(sdlgpu PRIVATE 3rd-party/sdl-gpu/src/externals/stb_image_write)
target_include_directories(sdlgpu PRIVATE 3rd-party/SDL2-2.0.7/include) target_include_directories(sdlgpu PRIVATE 3rd-party/SDL2-2.0.8/include)
if(WIN32) if(WIN32)
target_link_libraries(sdlgpu opengl32) target_link_libraries(sdlgpu opengl32)
@ -287,7 +287,7 @@ set(SDLNET_SRC
) )
add_library(sdlnet STATIC ${SDLNET_SRC}) add_library(sdlnet STATIC ${SDLNET_SRC})
target_include_directories(sdlnet PRIVATE 3rd-party/SDL2-2.0.7/include) target_include_directories(sdlnet PRIVATE 3rd-party/SDL2-2.0.8/include)
if(WIN32) if(WIN32)
target_link_libraries(sdlnet ws2_32) target_link_libraries(sdlnet ws2_32)
@ -437,7 +437,7 @@ foreach(TIC80_OUTPUT ${TIC80_OUTPUTS})
endif() endif()
target_include_directories(${TIC80_OUTPUT} PRIVATE include) target_include_directories(${TIC80_OUTPUT} PRIVATE include)
target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2-2.0.7/include) target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2-2.0.8/include)
target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/sdl-gpu/include) target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/sdl-gpu/include)
target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2_net-2.0.1) target_include_directories(${TIC80_OUTPUT} PRIVATE 3rd-party/SDL2_net-2.0.1)