Switch header convention from #include "SDL.h" to #include <SDL3/SDLh>
I ran this script in the include directory:
```sh
sed -i '' -e 's,#include "\(SDL.*\)",#include <SDL3/\1>,' *.h
```
I ran this script in the src directory:
```sh
for i in ../include/SDL3/SDL*.h
do hdr=$(basename $i)
if [ x"$(echo $hdr | egrep 'SDL_main|SDL_name|SDL_test|SDL_syswm|SDL_opengl|SDL_egl|SDL_vulkan')" != x ]; then
find . -type f -exec sed -i '' -e 's,#include "\('$hdr'\)",#include <SDL3/\1>,' {} \;
else
find . -type f -exec sed -i '' -e '/#include "'$hdr'"/d' {} \;
fi
done
```
Fixes https://github.com/libsdl-org/SDL/issues/6575
This commit is contained in:
1 parent
9a64aa6f95
commit
0a48abc860
661 files changed
+1623
-2833
No files matched your search
+2
-2
@@ -21,8 +21,8 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test_font.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test_font.h>
|
||||
|
||||
static SDL_Window *window;
|
||||
static SDL_Renderer *renderer;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int done;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
/* Define this for verbose output while mapping controllers */
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static struct
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#if HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
/*
|
||||
Absolutely basic tests just to see if we get the expected value
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten/emscripten.h>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static SDL_AudioSpec spec;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static void
|
||||
print_devices(int iscapture)
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
#include "testautomation_suites.h"
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* New/updated tests: aschiffler at ferzkopp dot net
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Events test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* GUID test suite
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Hints test suite
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
|
||||
const char* _HintsEnum[] =
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Joystick test suite
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
#include "../src/joystick/usb_ids.h"
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Keyboard test suite
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
* Released under Public Domain.
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
|
||||
/* !
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <float.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Constants ================== */
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
*/
|
||||
#include <limits.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Pixels test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Test case functions */
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Original code: automated SDL platform test written by Edgar Simo "bobbens"
|
||||
* Extended and updated by aschiffler at ferzkopp dot net
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Original code: automated SDL rect test written by Edgar Simo "bobbens"
|
||||
* New/updated tests: aschiffler at ferzkopp dot net
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
* Original code: automated SDL platform test written by Edgar Simo "bobbens"
|
||||
* Extended and extensively updated by aschiffler at ferzkopp dot net
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* ================= Test Case Implementation ================== */
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <limits.h>
|
||||
#include <float.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Test case functions */
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Standard C library routine test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Test case functions */
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#ifndef _testsuites_h
|
||||
#define _testsuites_h
|
||||
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Test collections */
|
||||
extern SDLTest_TestSuiteReference audioTestSuite;
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
#ifdef __MACOS__
|
||||
#include <unistd.h> /* For unlink() */
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
/**
|
||||
* SysWM test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_syswm.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_syswm.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Test case functions */
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Timer test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Flag indicating if the param should be checked */
|
||||
int _paramCheck = 0;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Video test suite
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
/* Private helpers */
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
freely.
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
/* Stolen from the mailing list */
|
||||
/* Creates a new mouse cursor from an XPM */
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static void
|
||||
print_mode(const char *prefix, const SDL_DisplayMode *mode)
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#define NUM_OBJECTS 100
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
SDL_Window *window;
|
||||
SDL_Renderer *renderer;
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static int alive = 0;
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@ static int run_test(void);
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "SDL_stdinc.h"
|
||||
#include "SDL_endian.h"
|
||||
#include "../src/core/linux/SDL_evdev_capabilities.h"
|
||||
#include "../src/core/linux/SDL_evdev_capabilities.c"
|
||||
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
|
||||
/* WARNING ! those 2 files will be destroyed by this test program */
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
/* Simple test of filesystem functions. */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
/* Simple program to test the SDL game controller routines */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
|
||||
+3
-3
@@ -18,14 +18,14 @@
|
||||
|
||||
#include <stdlib.h> /* for exit() */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test.h"
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test.h>
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#define WIDTH 640
|
||||
#define HEIGHT 480
|
||||
|
||||
+2
-2
@@ -9,13 +9,13 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL_opengl.h"
|
||||
#include <SDL3/SDL_opengl.h>
|
||||
|
||||
typedef struct GL_Context
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#if defined(__IOS__) || defined(__ANDROID__)
|
||||
#define HAVE_OPENGLES
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#ifdef HAVE_OPENGLES
|
||||
|
||||
#include "SDL_opengles.h"
|
||||
#include <SDL3/SDL_opengles.h>
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
static SDL_GLContext *context = NULL;
|
||||
|
||||
+2
-2
@@ -15,7 +15,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#if defined(__IOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
|
||||
#define HAVE_OPENGLES2
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#ifdef HAVE_OPENGLES2
|
||||
|
||||
#include "SDL_opengles2.h"
|
||||
#include <SDL3/SDL_opengles2.h>
|
||||
|
||||
typedef struct GLES2_Context
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#if defined(__IOS__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__WINDOWS__) || defined(__LINUX__)
|
||||
#define HAVE_OPENGLES2
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#ifdef HAVE_OPENGLES2
|
||||
|
||||
#include "SDL_opengles2.h"
|
||||
#include <SDL3/SDL_opengles2.h>
|
||||
|
||||
typedef struct GLES2_Context
|
||||
{
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static SDL_Haptic *haptic;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
/* !!! FIXME: rewrite this to be wired in to test framework. */
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static size_t
|
||||
|
||||
+2
-2
@@ -13,12 +13,12 @@
|
||||
If you build without SDL_ttf, you can use the GNU Unifont hex file instead.
|
||||
Download at http://unifoundry.com/unifont.html */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#ifdef HAVE_SDL_TTF
|
||||
#include "SDL_ttf.h"
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#define DEFAULT_PTSIZE 30
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#define SWAP(typ,a,b) do{typ t=a;a=b;b=t;}while(0)
|
||||
#define NUM_OBJECTS 100
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten/emscripten.h>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
typedef int (*fntype) (const char *);
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
/* !!! FIXME: move this to the test framework */
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <signal.h>
|
||||
#include <stdlib.h> /* for atexit() */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static SDL_mutex *mutex = NULL;
|
||||
static SDL_threadID mainthread;
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
||||
static void
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
freely.
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten/emscripten.h>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#include <stdio.h> /* for fflush() and stdout */
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
/* Definitions for platform dependent windowing functions to test SDL
|
||||
integration with native windows
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
||||
@@ -19,9 +19,8 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_stdinc.h"
|
||||
#include "SDL_opengl.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_opengl.h>
|
||||
|
||||
static SDL_Renderer *renderer = NULL;
|
||||
static SDL_Window *window = NULL;
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#include "testyuv_cvt.h"
|
||||
#include "testutils.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
/*
|
||||
* Watcom C flags these as Warning 201: "Unreachable code" if you just
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
/* Simple test of power subsystem. */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static void
|
||||
report_power(void)
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
freely.
|
||||
*/
|
||||
|
||||
#include "SDL_test.h"
|
||||
#include <SDL3/SDL_test.h>
|
||||
|
||||
static int SDLCALL
|
||||
num_compare(const void *_a, const void *_b)
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten/emscripten.h>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
freely.
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
/*
|
||||
* includes
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
|
||||
static SDL_Haptic *haptic;
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#define WINDOW_WIDTH 640
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#define NUM_THREADS 10
|
||||
/* This value should be smaller than the maximum count of the */
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
/* Simple test of the SDL sensor code */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static const char *GetSensorTypeString(SDL_SensorType type)
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,13 +11,13 @@
|
||||
*/
|
||||
/* This is a simple example of using GLSL shaders with SDL */
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
|
||||
#include "SDL_opengl.h"
|
||||
#include <SDL3/SDL_opengl.h>
|
||||
|
||||
|
||||
static SDL_bool shaders_supported;
|
||||
|
||||
+1
-2
@@ -11,8 +11,7 @@
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include "SDL_shape.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#define SHAPED_WINDOW_X 150
|
||||
#define SHAPED_WINDOW_Y 150
|
||||
|
||||
+2
-2
@@ -18,8 +18,8 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test.h"
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test.h>
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#define NUM_SPRITES 100
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#define WINDOW_WIDTH 640
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include "testutils.h"
|
||||
|
||||
#define MOOSEPIC_W 64
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
|
||||
/* Program to test surround sound audio channels */
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static int total_channels;
|
||||
static int active_channel;
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static SDL_TLSID tls;
|
||||
static int alive = 0;
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
/* Test program to check the resolution of the SDL timer on the current
|
||||
platform
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#define DEFAULT_RESOLUTION 1
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
static void tryOpenURL(const char *url)
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Zlib
|
||||
#ifndef TESTUTILS_H
|
||||
#define TESTUTILS_H
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
SDL_Texture *LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent,
|
||||
int *width_out, int *height_out);
|
||||
|
||||
+1
-2
@@ -13,8 +13,7 @@
|
||||
/* Test program to compare the compile-time version of SDL with the linked
|
||||
version of SDL
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_revision.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test.h"
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test.h>
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include "testutils.h"
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
|
||||
#if defined(__ANDROID__) && defined(__ARM_EABI__) && !defined(__ARM_ARCH_7A__)
|
||||
|
||||
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
|
||||
/* SDL includes a copy for building on systems without the Vulkan SDK */
|
||||
#include "../src/video/khronos/vulkan/vulkan.h"
|
||||
#endif
|
||||
#include "SDL_vulkan.h"
|
||||
#include <SDL3/SDL_vulkan.h>
|
||||
|
||||
#ifndef UINT64_MAX /* VS2008 */
|
||||
#define UINT64_MAX 18446744073709551615
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <emscripten/emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "SDL_test_common.h"
|
||||
#include "SDL_test_font.h"
|
||||
#include <SDL3/SDL_test_common.h>
|
||||
#include <SDL3/SDL_test_font.h>
|
||||
|
||||
static SDLTest_CommonState *state;
|
||||
int done;
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
#include "SDL.h"
|
||||
#include "SDL_test_font.h"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_test_font.h>
|
||||
#include "testyuv_cvt.h"
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
freely.
|
||||
*/
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#include "testyuv_cvt.h"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "SDL.h"
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#define NUMTHREADS 10
|
||||
|
||||
|
||||
Reference in new issue
Block a user