encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: final report fixes for mmx, ssemath, dummyvideo, wasapi, xinput. 

also moved CoreVideo framework out of if(SDL_FILE) block, and removed a
now-irrelevant mingw related fixme.
This commit is contained in:
Ozkan Sezer 2021-11-22 14:10:02 +03:00
parent 34d9c2e28f
commit 35b7ce1893
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -592,7 +592,7 @@ if(SDL_ASSEMBLY)
# TODO: Those all seem to be quite GCC specific - needs to be # TODO: Those all seem to be quite GCC specific - needs to be
# reworked for better compiler support # reworked for better compiler support
set(HAVE_ASSEMBLY TRUE) set(HAVE_ASSEMBLY TRUE)
if(MMX) if(SDL_MMX)
set(CMAKE_REQUIRED_FLAGS "-mmmx") set(CMAKE_REQUIRED_FLAGS "-mmmx")
check_c_source_compiles(" check_c_source_compiles("
#ifdef __MINGW32__ #ifdef __MINGW32__
@ -709,8 +709,9 @@ if(SDL_ASSEMBLY)
list(APPEND EXTRA_CFLAGS "-mfpmath=387") list(APPEND EXTRA_CFLAGS "-mfpmath=387")
endif() endif()
endif() endif()
set(HAVE_SSEMATH TRUE)
endif() endif()
else()
set(HAVE_SSEMATH TRUE)
endif() endif()
check_include_file("immintrin.h" HAVE_IMMINTRIN_H) check_include_file("immintrin.h" HAVE_IMMINTRIN_H)
@ -993,7 +994,7 @@ if(SDL_VIDEO)
set(SDL_VIDEO_DRIVER_DUMMY 1) set(SDL_VIDEO_DRIVER_DUMMY 1)
file(GLOB VIDEO_DUMMY_SOURCES ${SDL2_SOURCE_DIR}/src/video/dummy/*.c) file(GLOB VIDEO_DUMMY_SOURCES ${SDL2_SOURCE_DIR}/src/video/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${VIDEO_DUMMY_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${VIDEO_DUMMY_SOURCES})
set(HAVE_DUMMY TRUE) set(HAVE_DUMMYVIDEO TRUE)
set(HAVE_SDL_VIDEO TRUE) set(HAVE_SDL_VIDEO TRUE)
endif() endif()
if(SDL_OFFSCREEN) if(SDL_OFFSCREEN)
@ -1572,6 +1573,7 @@ elseif(WINDOWS)
if(SDL_WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H) if(SDL_WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H)
set(SDL_AUDIO_DRIVER_WASAPI 1) set(SDL_AUDIO_DRIVER_WASAPI 1)
set(HAVE_WASAPI TRUE)
file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c) file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c)
if(WINDOWS_STORE) if(WINDOWS_STORE)
list(APPEND WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/SDL_wasapi_winrt.cpp) list(APPEND WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/SDL_wasapi_winrt.cpp)
@ -1675,8 +1677,6 @@ elseif(WINDOWS)
) )
endif() endif()
# TODO: in configure.ac the check for timers is set on
# cygwin | mingw32* - does this include mingw32CE?
if(SDL_TIMERS) if(SDL_TIMERS)
set(SDL_TIMER_WINDOWS 1) set(SDL_TIMER_WINDOWS 1)
file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/windows/*.c) file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/windows/*.c)
@ -1726,6 +1726,7 @@ elseif(WINDOWS)
endif() endif()
if(HAVE_XINPUT_H) if(HAVE_XINPUT_H)
set(SDL_JOYSTICK_XINPUT 1) set(SDL_JOYSTICK_XINPUT 1)
set(HAVE_XINPUT TRUE)
if(HAVE_WINDOWS_GAMING_INPUT_H) if(HAVE_WINDOWS_GAMING_INPUT_H)
set(SDL_JOYSTICK_WGI 1) set(SDL_JOYSTICK_WGI 1)
endif() endif()
@ -1774,6 +1775,7 @@ elseif(APPLE)
set(SDL_FRAMEWORK_CARBON 1) set(SDL_FRAMEWORK_CARBON 1)
endif() endif()
set(SDL_FRAMEWORK_FOUNDATION 1) set(SDL_FRAMEWORK_FOUNDATION 1)
set(SDL_FRAMEWORK_COREVIDEO 1)
# Requires the darwin file implementation # Requires the darwin file implementation
if(SDL_FILE) if(SDL_FILE)
@ -1782,8 +1784,6 @@ elseif(APPLE)
# !!! FIXME: modern CMake doesn't need "LANGUAGE C" for Objective-C. # !!! FIXME: modern CMake doesn't need "LANGUAGE C" for Objective-C.
set_source_files_properties(${EXTRA_SOURCES} PROPERTIES LANGUAGE C) set_source_files_properties(${EXTRA_SOURCES} PROPERTIES LANGUAGE C)
set(HAVE_SDL_FILE TRUE) set(HAVE_SDL_FILE TRUE)
# !!! FIXME: why is COREVIDEO inside this if() block?
set(SDL_FRAMEWORK_COREVIDEO 1)
else() else()
message_error("SDL_FILE must be enabled to build on MacOS X") message_error("SDL_FILE must be enabled to build on MacOS X")
endif() endif()
@ -2220,7 +2220,6 @@ elseif(VITA)
set(SOURCE_FILES ${SOURCE_FILES} ${VITA_VIDEO_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${VITA_VIDEO_SOURCES})
set(HAVE_SDL_VIDEO TRUE) set(HAVE_SDL_VIDEO TRUE)
if(VIDEO_VITA_PIB) if(VIDEO_VITA_PIB)
check_include_file(pib.h HAVE_PIGS_IN_BLANKET_H) check_include_file(pib.h HAVE_PIGS_IN_BLANKET_H)