From e8dd951c6c2bc3f3496eec26192b9b81c062ca1a Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sat, 23 Jul 2022 04:18:22 +0200 Subject: Use find_package for SDL libraries CMake already distributes FindSDL*.cmake files for SDL and SDL_mixer, which support custom prefixes via environment variables, removing the need for ad-hoc logic in Win9x builds. Also, according to FindSDL.cmake, #include is the preferred way for portability reasons, instead of #include , which is the option that has been used so far. --- src/pad/CMakeLists.txt | 2 +- src/pad/sdl-1.2/src/pad.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pad') diff --git a/src/pad/CMakeLists.txt b/src/pad/CMakeLists.txt index c1cab30..6470865 100644 --- a/src/pad/CMakeLists.txt +++ b/src/pad/CMakeLists.txt @@ -9,7 +9,7 @@ if(PS1_BUILD) elseif(SDL1_2_BUILD) set(src ${src} "sdl-1.2/src/pad.c") set(inc ${inc} "sdl-1.2/inc") - set(deps ${deps} SDL) + set(deps ${deps} SDL::SDL) endif() add_library(pad ${src}) diff --git a/src/pad/sdl-1.2/src/pad.c b/src/pad/sdl-1.2/src/pad.c index f6a96c1..57fdb25 100644 --- a/src/pad/sdl-1.2/src/pad.c +++ b/src/pad/sdl-1.2/src/pad.c @@ -1,5 +1,5 @@ #include -#include +#include #include void pad_port_update(struct pad *const p) -- cgit v1.2.3