aboutsummaryrefslogtreecommitdiff
path: root/src/gfx/sdl-1.2
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2022-07-23 04:18:22 +0200
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2022-07-23 04:23:05 +0200
commite8dd951c6c2bc3f3496eec26192b9b81c062ca1a (patch)
treec209fdc85fb39499cd58925aace8e179b8998213 /src/gfx/sdl-1.2
parent94d98176ea79edc87f11456bbb295e82381fc947 (diff)
downloadjancity-e8dd951c6c2bc3f3496eec26192b9b81c062ca1a.tar.gz
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 <SDL.h> is the preferred way for portability reasons, instead of #include <SDL/SDL.h>, which is the option that has been used so far.
Diffstat (limited to 'src/gfx/sdl-1.2')
-rw-r--r--src/gfx/sdl-1.2/inc/gfx/port.h2
-rw-r--r--src/gfx/sdl-1.2/privinc/sdl-1.2/gfx_private.h2
-rw-r--r--src/gfx/sdl-1.2/src/env.c2
-rw-r--r--src/gfx/sdl-1.2/src/rect.c2
-rw-r--r--src/gfx/sdl-1.2/src/sprite.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gfx/sdl-1.2/inc/gfx/port.h b/src/gfx/sdl-1.2/inc/gfx/port.h
index 9e58498..cca4a3e 100644
--- a/src/gfx/sdl-1.2/inc/gfx/port.h
+++ b/src/gfx/sdl-1.2/inc/gfx/port.h
@@ -1,7 +1,7 @@
#ifndef GFX_SDL_H
#define GFX_SDL_H
-#include <SDL/SDL.h>
+#include <SDL.h>
#include <stdbool.h>
#ifdef __cplusplus
diff --git a/src/gfx/sdl-1.2/privinc/sdl-1.2/gfx_private.h b/src/gfx/sdl-1.2/privinc/sdl-1.2/gfx_private.h
index d095cc0..9d952d1 100644
--- a/src/gfx/sdl-1.2/privinc/sdl-1.2/gfx_private.h
+++ b/src/gfx/sdl-1.2/privinc/sdl-1.2/gfx_private.h
@@ -2,7 +2,7 @@
#define GFX_SDL_12_PRIVATE_H
#include <gfx.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef __cplusplus
extern "C"
diff --git a/src/gfx/sdl-1.2/src/env.c b/src/gfx/sdl-1.2/src/env.c
index 74ebb2f..c6239f3 100644
--- a/src/gfx/sdl-1.2/src/env.c
+++ b/src/gfx/sdl-1.2/src/env.c
@@ -1,7 +1,7 @@
#include <gfx.h>
#include <gfx_private.h>
#include <sdl-1.2/gfx_private.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/gfx/sdl-1.2/src/rect.c b/src/gfx/sdl-1.2/src/rect.c
index eab7145..bf4b54d 100644
--- a/src/gfx/sdl-1.2/src/rect.c
+++ b/src/gfx/sdl-1.2/src/rect.c
@@ -1,7 +1,7 @@
#include <gfx.h>
#include <gfx/port.h>
#include <sdl-1.2/gfx_private.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
void rect_sort(struct rect *const r)
{
diff --git a/src/gfx/sdl-1.2/src/sprite.c b/src/gfx/sdl-1.2/src/sprite.c
index 6dbfa96..4c1ecbc 100644
--- a/src/gfx/sdl-1.2/src/sprite.c
+++ b/src/gfx/sdl-1.2/src/sprite.c
@@ -2,8 +2,8 @@
#include <gfx/port.h>
#include <header.h>
#include <sdl-1.2/gfx_private.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL.h>
+#include <SDL_rotozoom.h>
#include <errno.h>
#include <stddef.h>
#include <stdlib.h>