From fec6b4bfcc20985ac4e0429df44c1987195b12cd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 16 Oct 2023 00:30:41 +0300 Subject: [PATCH 33/33] sdl3: Include SDL3 headers See osdn #48832 Signed-off-by: Marko Lindqvist --- client/gui-sdl3/canvas.c | 11 +++-------- client/gui-sdl3/canvas.h | 9 +++------ client/gui-sdl3/chatline.c | 8 ++------ client/gui-sdl3/citydlg.c | 8 ++------ client/gui-sdl3/citydlg.h | 8 ++------ client/gui-sdl3/cityrep.c | 8 ++------ client/gui-sdl3/cma_fe.c | 8 ++------ client/gui-sdl3/colors.c | 8 ++------ client/gui-sdl3/colors.h | 13 +++++-------- client/gui-sdl3/connectdlg.c | 8 ++------ client/gui-sdl3/dialogs.c | 8 ++------ client/gui-sdl3/dialogs.h | 9 +++------ client/gui-sdl3/diplodlg.c | 8 ++------ client/gui-sdl3/finddlg.c | 8 ++------ client/gui-sdl3/gotodlg.c | 8 ++------ client/gui-sdl3/graphics.c | 14 ++++---------- client/gui-sdl3/graphics.h | 8 ++------ client/gui-sdl3/gui_main.c | 8 ++------ client/gui-sdl3/gui_main.h | 8 ++------ client/gui-sdl3/gui_mouse.c | 8 ++------ client/gui-sdl3/gui_string.c | 8 ++------ client/gui-sdl3/gui_string.h | 11 +++-------- client/gui-sdl3/gui_tilespec.c | 8 ++------ client/gui-sdl3/gui_tilespec.h | 8 ++------ client/gui-sdl3/helpdlg.c | 8 ++------ client/gui-sdl3/inteldlg.c | 8 ++------ client/gui-sdl3/mapctrl.c | 8 ++------ client/gui-sdl3/mapctrl.h | 8 ++------ client/gui-sdl3/mapview.c | 8 ++------ client/gui-sdl3/mapview.h | 8 ++------ client/gui-sdl3/menu.c | 8 ++------ client/gui-sdl3/messagewin.c | 8 ++------ client/gui-sdl3/optiondlg.c | 8 ++------ client/gui-sdl3/plrdlg.c | 8 ++------ client/gui-sdl3/repodlgs.h | 8 ++------ client/gui-sdl3/sprite.c | 11 +++-------- client/gui-sdl3/themebackgrounds.h | 8 ++------ client/gui-sdl3/utf8string.c | 8 ++------ client/gui-sdl3/utf8string.h | 8 ++------ client/gui-sdl3/widget.c | 8 ++------ client/gui-sdl3/widget_button.c | 8 ++------ client/gui-sdl3/widget_checkbox.c | 8 ++------ client/gui-sdl3/widget_combo.c | 8 ++------ client/gui-sdl3/widget_core.c | 8 ++------ client/gui-sdl3/widget_edit.c | 8 ++------ client/gui-sdl3/widget_icon.c | 8 ++------ client/gui-sdl3/widget_label.c | 8 ++------ client/gui-sdl3/widget_scrollbar.c | 8 ++------ client/gui-sdl3/widget_window.c | 8 ++------ client/gui-sdl3/wldlg.c | 8 ++------ 50 files changed, 110 insertions(+), 312 deletions(-) diff --git a/client/gui-sdl3/canvas.c b/client/gui-sdl3/canvas.c index 6648e90f76..2fae29f8b9 100644 --- a/client/gui-sdl3/canvas.c +++ b/client/gui-sdl3/canvas.c @@ -15,14 +15,9 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/canvas.h b/client/gui-sdl3/canvas.h index ac80e286b3..d8420ce240 100644 --- a/client/gui-sdl3/canvas.h +++ b/client/gui-sdl3/canvas.h @@ -14,13 +14,10 @@ #ifndef FC__CANVAS_H #define FC__CANVAS_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +/* client */ #include "canvas_g.h" struct canvas { diff --git a/client/gui-sdl3/chatline.c b/client/gui-sdl3/chatline.c index 5355c4a8e1..0810a6099f 100644 --- a/client/gui-sdl3/chatline.c +++ b/client/gui-sdl3/chatline.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/citydlg.c b/client/gui-sdl3/citydlg.c index db7e0ef7e1..2462b6502c 100644 --- a/client/gui-sdl3/citydlg.c +++ b/client/gui-sdl3/citydlg.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "astring.h" diff --git a/client/gui-sdl3/citydlg.h b/client/gui-sdl3/citydlg.h index 853eb01470..822e7ad492 100644 --- a/client/gui-sdl3/citydlg.h +++ b/client/gui-sdl3/citydlg.h @@ -22,12 +22,8 @@ #ifndef FC__CITYDLG_H #define FC__CITYDLG_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* common */ #include "effects.h" diff --git a/client/gui-sdl3/cityrep.c b/client/gui-sdl3/cityrep.c index 7d61ca5b42..4b849bc664 100644 --- a/client/gui-sdl3/cityrep.c +++ b/client/gui-sdl3/cityrep.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/cma_fe.c b/client/gui-sdl3/cma_fe.c index 25ff53e5d3..ada0848deb 100644 --- a/client/gui-sdl3/cma_fe.c +++ b/client/gui-sdl3/cma_fe.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/colors.c b/client/gui-sdl3/colors.c index fd620ff64d..19ca06dedf 100644 --- a/client/gui-sdl3/colors.c +++ b/client/gui-sdl3/colors.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* common */ #include "rgbcolor.h" diff --git a/client/gui-sdl3/colors.h b/client/gui-sdl3/colors.h index 9bee0b12c5..725e4ea2bb 100644 --- a/client/gui-sdl3/colors.h +++ b/client/gui-sdl3/colors.h @@ -22,18 +22,15 @@ #ifndef FC__COLORS_H #define FC__COLORS_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include + +/* client */ +#include "colors_g.h" /* gui-sdl3 */ #include "themecolors.h" -#include "colors_g.h" - struct color { SDL_Color *color; }; diff --git a/client/gui-sdl3/connectdlg.c b/client/gui-sdl3/connectdlg.c index fb908a8b26..360d6c4ee1 100644 --- a/client/gui-sdl3/connectdlg.c +++ b/client/gui-sdl3/connectdlg.c @@ -25,12 +25,8 @@ #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/dialogs.c b/client/gui-sdl3/dialogs.c index 1020c08ca6..d0ff0dc6dc 100644 --- a/client/gui-sdl3/dialogs.c +++ b/client/gui-sdl3/dialogs.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "astring.h" diff --git a/client/gui-sdl3/dialogs.h b/client/gui-sdl3/dialogs.h index 3e98780c5b..55660df1aa 100644 --- a/client/gui-sdl3/dialogs.h +++ b/client/gui-sdl3/dialogs.h @@ -22,13 +22,10 @@ #ifndef FC__DIALOGS_H #define FC__DIALOGS_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +/* client */ #include "dialogs_g.h" struct widget; diff --git a/client/gui-sdl3/diplodlg.c b/client/gui-sdl3/diplodlg.c index 9248655897..9f82b5f4ca 100644 --- a/client/gui-sdl3/diplodlg.c +++ b/client/gui-sdl3/diplodlg.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/finddlg.c b/client/gui-sdl3/finddlg.c index 548ebed1e7..c209b08f5a 100644 --- a/client/gui-sdl3/finddlg.c +++ b/client/gui-sdl3/finddlg.c @@ -17,12 +17,8 @@ #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/gotodlg.c b/client/gui-sdl3/gotodlg.c index 3b65767c51..e06edd28d8 100644 --- a/client/gui-sdl3/gotodlg.c +++ b/client/gui-sdl3/gotodlg.c @@ -17,12 +17,8 @@ #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "bitvector.h" diff --git a/client/gui-sdl3/graphics.c b/client/gui-sdl3/graphics.c index 076989f4e8..a762dd5523 100644 --- a/client/gui-sdl3/graphics.c +++ b/client/gui-sdl3/graphics.c @@ -25,16 +25,10 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#include -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#include -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/graphics.h b/client/gui-sdl3/graphics.h index b3083855c6..48046066cd 100644 --- a/client/gui-sdl3/graphics.h +++ b/client/gui-sdl3/graphics.h @@ -24,15 +24,11 @@ #ifndef FC__GRAPHICS_H #define FC__GRAPHICS_H -/* SDL */ +/* SDL3 */ #ifdef SDL2_GFX_FROM_TREE #include "SDL2_gfx/SDL2_rotozoom.h" #else -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +#include #endif /* SDL2_GFX_FROM_TREE */ /* client */ diff --git a/client/gui-sdl3/gui_main.c b/client/gui-sdl3/gui_main.c index 2fd87bfd58..47d7f73b25 100644 --- a/client/gui-sdl3/gui_main.c +++ b/client/gui-sdl3/gui_main.c @@ -35,12 +35,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fc_cmdline.h" diff --git a/client/gui-sdl3/gui_main.h b/client/gui-sdl3/gui_main.h index 02b0da226f..ab889b41fd 100644 --- a/client/gui-sdl3/gui_main.h +++ b/client/gui-sdl3/gui_main.h @@ -22,12 +22,8 @@ #ifndef FC__GUI_MAIN_H #define FC__GUI_MAIN_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* client/include */ #include "gui_main_g.h" diff --git a/client/gui-sdl3/gui_mouse.c b/client/gui-sdl3/gui_mouse.c index 9974d1e456..620f191ac5 100644 --- a/client/gui-sdl3/gui_mouse.c +++ b/client/gui-sdl3/gui_mouse.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/gui_string.c b/client/gui-sdl3/gui_string.c index 0e7efc28f8..226402de78 100644 --- a/client/gui-sdl3/gui_string.c +++ b/client/gui-sdl3/gui_string.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/gui_string.h b/client/gui-sdl3/gui_string.h index 8aa022250b..eb0e91d019 100644 --- a/client/gui-sdl3/gui_string.h +++ b/client/gui-sdl3/gui_string.h @@ -22,14 +22,9 @@ #ifndef FC__GUISTRING_H #define FC__GUISTRING_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +#include /* common */ #include "fc_types.h" diff --git a/client/gui-sdl3/gui_tilespec.c b/client/gui-sdl3/gui_tilespec.c index f43ea9119e..275f0c54c9 100644 --- a/client/gui-sdl3/gui_tilespec.c +++ b/client/gui-sdl3/gui_tilespec.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/gui_tilespec.h b/client/gui-sdl3/gui_tilespec.h index 93d70c6a10..cf459f5c9b 100644 --- a/client/gui-sdl3/gui_tilespec.h +++ b/client/gui-sdl3/gui_tilespec.h @@ -22,12 +22,8 @@ #ifndef FC__GUI_TILESPEC_H #define FC__GUI_TILESPEC_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* client */ #include "tilespec.h" diff --git a/client/gui-sdl3/helpdlg.c b/client/gui-sdl3/helpdlg.c index 3c43217eb6..3f79a9d6bc 100644 --- a/client/gui-sdl3/helpdlg.c +++ b/client/gui-sdl3/helpdlg.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/inteldlg.c b/client/gui-sdl3/inteldlg.c index ca9cfeac5a..6a8c285765 100644 --- a/client/gui-sdl3/inteldlg.c +++ b/client/gui-sdl3/inteldlg.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/mapctrl.c b/client/gui-sdl3/mapctrl.c index e6f22a4fd4..672e91de2e 100644 --- a/client/gui-sdl3/mapctrl.c +++ b/client/gui-sdl3/mapctrl.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/mapctrl.h b/client/gui-sdl3/mapctrl.h index b056279312..7f732eeff7 100644 --- a/client/gui-sdl3/mapctrl.h +++ b/client/gui-sdl3/mapctrl.h @@ -22,12 +22,8 @@ #ifndef FC__MAPCTRL_H #define FC__MAPCTRL_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* common */ #include "fc_types.h" diff --git a/client/gui-sdl3/mapview.c b/client/gui-sdl3/mapview.c index 9f2270f618..ff860aad5b 100644 --- a/client/gui-sdl3/mapview.c +++ b/client/gui-sdl3/mapview.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "astring.h" diff --git a/client/gui-sdl3/mapview.h b/client/gui-sdl3/mapview.h index 7da7358e42..f96a1c3b53 100644 --- a/client/gui-sdl3/mapview.h +++ b/client/gui-sdl3/mapview.h @@ -22,12 +22,8 @@ #ifndef FC__MAPVIEW_H #define FC__MAPVIEW_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* common */ #include "unitlist.h" diff --git a/client/gui-sdl3/menu.c b/client/gui-sdl3/menu.c index 4f0548d82a..bfc80a8a75 100644 --- a/client/gui-sdl3/menu.c +++ b/client/gui-sdl3/menu.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/messagewin.c b/client/gui-sdl3/messagewin.c index 293cff0b2e..12b3d3dddb 100644 --- a/client/gui-sdl3/messagewin.c +++ b/client/gui-sdl3/messagewin.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/optiondlg.c b/client/gui-sdl3/optiondlg.c index f329391c8b..434d59f4e6 100644 --- a/client/gui-sdl3/optiondlg.c +++ b/client/gui-sdl3/optiondlg.c @@ -26,12 +26,8 @@ #include #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/plrdlg.c b/client/gui-sdl3/plrdlg.c index 0eb7a00573..0d1f5df91e 100644 --- a/client/gui-sdl3/plrdlg.c +++ b/client/gui-sdl3/plrdlg.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "astring.h" diff --git a/client/gui-sdl3/repodlgs.h b/client/gui-sdl3/repodlgs.h index 45da5ff1fb..64c986e78b 100644 --- a/client/gui-sdl3/repodlgs.h +++ b/client/gui-sdl3/repodlgs.h @@ -14,12 +14,8 @@ #ifndef FC__REPODLGS_H #define FC__REPODLGS_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* client/gui-sdl3 */ #include "gui_string.h" diff --git a/client/gui-sdl3/sprite.c b/client/gui-sdl3/sprite.c index c8758e24e5..68ecd83a77 100644 --- a/client/gui-sdl3/sprite.c +++ b/client/gui-sdl3/sprite.c @@ -15,14 +15,9 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include +#include /* utility */ #include "fcintl.h" diff --git a/client/gui-sdl3/themebackgrounds.h b/client/gui-sdl3/themebackgrounds.h index cce051da92..e9afa7bc41 100644 --- a/client/gui-sdl3/themebackgrounds.h +++ b/client/gui-sdl3/themebackgrounds.h @@ -14,12 +14,8 @@ #ifndef FC__THEMEBACKGROUNDS_H #define FC__THEMEBACKGROUNDS_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "registry.h" diff --git a/client/gui-sdl3/utf8string.c b/client/gui-sdl3/utf8string.c index a453bcc9d4..9f187f3049 100644 --- a/client/gui-sdl3/utf8string.c +++ b/client/gui-sdl3/utf8string.c @@ -17,12 +17,8 @@ #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "mem.h" diff --git a/client/gui-sdl3/utf8string.h b/client/gui-sdl3/utf8string.h index aa4132386e..9aa6300bac 100644 --- a/client/gui-sdl3/utf8string.h +++ b/client/gui-sdl3/utf8string.h @@ -14,12 +14,8 @@ #ifndef FC__UTF8STRING_H #define FC__UTF8STRING_H -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include char **create_new_line_utf8strs(const char *pstr); diff --git a/client/gui-sdl3/widget.c b/client/gui-sdl3/widget.c index b869d8fb4e..b5a714c088 100644 --- a/client/gui-sdl3/widget.c +++ b/client/gui-sdl3/widget.c @@ -23,12 +23,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_button.c b/client/gui-sdl3/widget_button.c index 0e229a6484..6287725d7a 100644 --- a/client/gui-sdl3/widget_button.c +++ b/client/gui-sdl3/widget_button.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_checkbox.c b/client/gui-sdl3/widget_checkbox.c index 6e6042723c..c712ed507e 100644 --- a/client/gui-sdl3/widget_checkbox.c +++ b/client/gui-sdl3/widget_checkbox.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_combo.c b/client/gui-sdl3/widget_combo.c index f948560707..a57268614f 100644 --- a/client/gui-sdl3/widget_combo.c +++ b/client/gui-sdl3/widget_combo.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_core.c b/client/gui-sdl3/widget_core.c index d44fddf3db..5bcdf7c603 100644 --- a/client/gui-sdl3/widget_core.c +++ b/client/gui-sdl3/widget_core.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* gui-sdl3 */ #include "colors.h" diff --git a/client/gui-sdl3/widget_edit.c b/client/gui-sdl3/widget_edit.c index 94cf0c207c..52f42b5aca 100644 --- a/client/gui-sdl3/widget_edit.c +++ b/client/gui-sdl3/widget_edit.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* gui-sdl3 */ #include "colors.h" diff --git a/client/gui-sdl3/widget_icon.c b/client/gui-sdl3/widget_icon.c index 8c0ace653f..45a5192d37 100644 --- a/client/gui-sdl3/widget_icon.c +++ b/client/gui-sdl3/widget_icon.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_label.c b/client/gui-sdl3/widget_label.c index 0449b0fca1..9d4c6bd684 100644 --- a/client/gui-sdl3/widget_label.c +++ b/client/gui-sdl3/widget_label.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_scrollbar.c b/client/gui-sdl3/widget_scrollbar.c index 4490050c9d..97b64d1552 100644 --- a/client/gui-sdl3/widget_scrollbar.c +++ b/client/gui-sdl3/widget_scrollbar.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/widget_window.c b/client/gui-sdl3/widget_window.c index 814d2f32f1..a9329eb940 100644 --- a/client/gui-sdl3/widget_window.c +++ b/client/gui-sdl3/widget_window.c @@ -15,12 +15,8 @@ #include #endif -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "log.h" diff --git a/client/gui-sdl3/wldlg.c b/client/gui-sdl3/wldlg.c index 3f1d79816b..a0baaaf6b9 100644 --- a/client/gui-sdl3/wldlg.c +++ b/client/gui-sdl3/wldlg.c @@ -24,12 +24,8 @@ #include -/* SDL2 */ -#ifdef SDL2_PLAIN_INCLUDE -#include -#else /* SDL2_PLAIN_INCLUDE */ -#include -#endif /* SDL2_PLAIN_INCLUDE */ +/* SDL3 */ +#include /* utility */ #include "fcintl.h" -- 2.42.0