geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added SDL_log.h to SDL_internal.h so logging is available everywhere

Sam Lantinga 2020-04-07 09:38:57 -07:00
parent 488b94cb40
commit b6afbe6317
49 changed files with 4 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SDL_error.c
View File

@ -22,7 +22,6 @@
/* Simple error handling in SDL */ /* Simple error handling in SDL */
#include "SDL_log.h"
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_error_c.h" #include "SDL_error_c.h"

2
src/SDL_internal.h
View File

@ -116,6 +116,8 @@
#define SDL_HAVE_YUV !SDL_LEAN_AND_MEAN #define SDL_HAVE_YUV !SDL_LEAN_AND_MEAN
#endif #endif
#include "SDL_log.h"
#endif /* SDL_internal_h_ */ #endif /* SDL_internal_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

1
src/audio/SDL_wave.c
View File

@ -34,7 +34,6 @@
/* Microsoft WAVE file loading routines */ /* Microsoft WAVE file loading routines */
#include "SDL_log.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_audio.h" #include "SDL_audio.h"
#include "SDL_wave.h" #include "SDL_wave.h"

1
src/audio/disk/SDL_diskaudio.c
View File

@ -33,7 +33,6 @@
#include "SDL_audio.h" #include "SDL_audio.h"
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "SDL_diskaudio.h" #include "SDL_diskaudio.h"
#include "SDL_log.h"
/* !!! FIXME: these should be SDL hints, not environment variables. */ /* !!! FIXME: these should be SDL hints, not environment variables. */
/* environment variables and defaults. */ /* environment variables and defaults. */

1
src/audio/emscripten/SDL_emscriptenaudio.c
View File

@ -23,7 +23,6 @@
#if SDL_AUDIO_DRIVER_EMSCRIPTEN #if SDL_AUDIO_DRIVER_EMSCRIPTEN
#include "SDL_audio.h" #include "SDL_audio.h"
#include "SDL_log.h"
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "SDL_emscriptenaudio.h" #include "SDL_emscriptenaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"

1
src/audio/wasapi/SDL_wasapi.c
View File

@ -29,7 +29,6 @@
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h" #include "../SDL_sysaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_log.h"
#define COBJMACROS #define COBJMACROS
#include <mmdeviceapi.h> #include <mmdeviceapi.h>

1
src/audio/wasapi/SDL_wasapi_win32.c
View File

@ -35,7 +35,6 @@
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h" #include "../SDL_sysaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_log.h"
#define COBJMACROS #define COBJMACROS
#include <mmdeviceapi.h> #include <mmdeviceapi.h>

1
src/audio/wasapi/SDL_wasapi_winrt.cpp
View File

@ -41,7 +41,6 @@ extern "C" {
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h" #include "../SDL_sysaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_log.h"
} }
#define COBJMACROS #define COBJMACROS

2
src/core/android/SDL_android.c
View File

@ -19,11 +19,11 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_atomic.h" #include "SDL_atomic.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_timer.h" #include "SDL_timer.h"

1
src/core/winrt/SDL_winrtapp_direct3d.cpp
View File

@ -50,7 +50,6 @@ extern "C" {
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_render.h" #include "SDL_render.h"

1
src/filesystem/cocoa/SDL_sysfilesystem.m
View File

@ -32,7 +32,6 @@
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_filesystem.h" #include "SDL_filesystem.h"
#include "SDL_log.h"
char * char *
SDL_GetBasePath(void) SDL_GetBasePath(void)

1
src/joystick/android/SDL_sysjoystick.c
View File

@ -31,7 +31,6 @@
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_log.h"
#include "SDL_sysjoystick_c.h" #include "SDL_sysjoystick_c.h"
#include "../SDL_joystick_c.h" #include "../SDL_joystick_c.h"
#include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_keyboard_c.h"

1
src/joystick/emscripten/SDL_sysjoystick.c
View File

@ -30,7 +30,6 @@
#include "SDL_joystick.h" #include "SDL_joystick.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_log.h"
#include "SDL_sysjoystick_c.h" #include "SDL_sysjoystick_c.h"
#include "../SDL_joystick_c.h" #include "../SDL_joystick_c.h"

1
src/joystick/hidapi/SDL_hidapi_gamecube.c
View File

@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_haptic.h" #include "SDL_haptic.h"

1
src/joystick/hidapi/SDL_hidapi_ps4.c
View File

@ -26,7 +26,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapi_steam.c
View File

@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -26,7 +26,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapi_xbox360.c
View File

@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapi_xbox360w.c
View File

@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapi_xboxone.c
View File

@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -26,7 +26,6 @@
#include "SDL_atomic.h" #include "SDL_atomic.h"
#include "SDL_endian.h" #include "SDL_endian.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"

1
src/joystick/windows/SDL_rawinputjoystick.c
View File

@ -36,7 +36,6 @@
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_endian.h" #include "SDL_endian.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_mutex.h" #include "SDL_mutex.h"
#include "../SDL_sysjoystick.h" #include "../SDL_sysjoystick.h"
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"

1
src/joystick/windows/SDL_xinputjoystick.c
View File

@ -26,7 +26,6 @@
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_windowsjoystick_c.h" #include "SDL_windowsjoystick_c.h"
#include "SDL_xinputjoystick_c.h" #include "SDL_xinputjoystick_c.h"

1
src/render/SDL_render.c
View File

@ -24,7 +24,6 @@
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_render.h" #include "SDL_render.h"
#include "SDL_sysrender.h" #include "SDL_sysrender.h"
#include "software/SDL_render_sw_c.h" #include "software/SDL_render_sw_c.h"

1
src/render/direct3d/SDL_render_d3d.c
View File

@ -30,7 +30,6 @@
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_loadso.h" #include "SDL_loadso.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_log.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "../SDL_sysrender.h" #include "../SDL_sysrender.h"
#include "../SDL_d3dmath.h" #include "../SDL_d3dmath.h"

1
src/render/metal/SDL_render_metal.m
View File

@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED #if SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_metal.h" #include "SDL_metal.h"

1
src/render/opengl/SDL_render_gl.c
View File

@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#include "../SDL_sysrender.h" #include "../SDL_sysrender.h"

1
src/render/opengl/SDL_shaders_gl.c
View File

@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_log.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_shaders_gl.h" #include "SDL_shaders_gl.h"

1
src/thread/pthread/SDL_systhread.c
View File

@ -47,7 +47,6 @@
#endif #endif
#endif #endif
#include "SDL_log.h"
#include "SDL_platform.h" #include "SDL_platform.h"
#include "SDL_thread.h" #include "SDL_thread.h"
#include "../SDL_thread_c.h" #include "../SDL_thread_c.h"

1
src/thread/stdcpp/SDL_sysmutex.cpp
View File

@ -23,7 +23,6 @@
extern "C" { extern "C" {
#include "SDL_thread.h" #include "SDL_thread.h"
#include "SDL_systhread_c.h" #include "SDL_systhread_c.h"
#include "SDL_log.h"
} }
#include <system_error> #include <system_error>

1
src/thread/stdcpp/SDL_systhread.cpp
View File

@ -26,7 +26,6 @@ extern "C" {
#include "SDL_thread.h" #include "SDL_thread.h"
#include "../SDL_thread_c.h" #include "../SDL_thread_c.h"
#include "../SDL_systhread.h" #include "../SDL_systhread.h"
#include "SDL_log.h"
} }
#include <mutex> #include <mutex>

1
src/video/SDL_egl.c
View File

@ -31,7 +31,6 @@
#endif #endif
#include "SDL_sysvideo.h" #include "SDL_sysvideo.h"
#include "SDL_log.h"
#include "SDL_egl_c.h" #include "SDL_egl_c.h"
#include "SDL_loadso.h" #include "SDL_loadso.h"
#include "SDL_hints.h" #include "SDL_hints.h"

1
src/video/SDL_vulkan_utils.c
View File

@ -22,7 +22,6 @@
#include "SDL_vulkan_internal.h" #include "SDL_vulkan_internal.h"
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_log.h"
/* !!! FIXME: this file doesn't match coding standards for SDL (brace position, etc). */ /* !!! FIXME: this file doesn't match coding standards for SDL (brace position, etc). */

1
src/video/android/SDL_androidtouch.c
View File

@ -26,7 +26,6 @@
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_log.h"
#include "SDL_androidtouch.h" #include "SDL_androidtouch.h"
#include "../../events/SDL_mouse_c.h" #include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_touch_c.h" #include "../../events/SDL_touch_c.h"

1
src/video/cocoa/SDL_cocoaopengles.m
View File

@ -25,7 +25,6 @@
#include "SDL_cocoavideo.h" #include "SDL_cocoavideo.h"
#include "SDL_cocoaopengles.h" #include "SDL_cocoaopengles.h"
#include "SDL_cocoaopengl.h" #include "SDL_cocoaopengl.h"
#include "SDL_log.h"
/* EGL implementation of SDL OpenGL support */ /* EGL implementation of SDL OpenGL support */

1
src/video/directfb/SDL_DirectFB_video.h
View File

@ -31,7 +31,6 @@
#include "SDL_scancode.h" #include "SDL_scancode.h"
#include "SDL_render.h" #include "SDL_render.h"
#include "SDL_log.h"
#define DFB_VERSIONNUM(X, Y, Z) \ #define DFB_VERSIONNUM(X, Y, Z) \
((X)*1000 + (Y)*100 + (Z)) ((X)*1000 + (Y)*100 + (Z))

3
src/video/kmsdrm/SDL_kmsdrmdyn.c
View File

@ -27,9 +27,6 @@
#include "SDL_kmsdrmdyn.h" #include "SDL_kmsdrmdyn.h"
#if DEBUG_DYNAMIC_KMSDRM
#include "SDL_log.h"
#endif
#ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC #ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC

2
src/video/kmsdrm/SDL_kmsdrmopengles.c
View File

@ -23,8 +23,6 @@
#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL
#include "SDL_log.h"
#include "SDL_kmsdrmvideo.h" #include "SDL_kmsdrmvideo.h"
#include "SDL_kmsdrmopengles.h" #include "SDL_kmsdrmopengles.h"
#include "SDL_kmsdrmdyn.h" #include "SDL_kmsdrmdyn.h"

1
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@ -26,7 +26,6 @@
/* SDL internals */ /* SDL internals */
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_log.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "../../events/SDL_events_c.h" #include "../../events/SDL_events_c.h"
#include "../../events/SDL_mouse_c.h" #include "../../events/SDL_mouse_c.h"

2
src/video/raspberry/SDL_rpiopengles.c
View File

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_log.h"
#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL

1
src/video/vivante/SDL_vivantevulkan.c
View File

@ -35,7 +35,6 @@
#include "SDL_loadso.h" #include "SDL_loadso.h"
#include "SDL_vivantevulkan.h" #include "SDL_vivantevulkan.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_log.h"
int VIVANTE_Vulkan_LoadLibrary(_THIS, const char *path) int VIVANTE_Vulkan_LoadLibrary(_THIS, const char *path)
{ {

3
src/video/wayland/SDL_waylanddyn.c
View File

@ -26,9 +26,6 @@
#include "SDL_waylanddyn.h" #include "SDL_waylanddyn.h"
#if DEBUG_DYNAMIC_WAYLAND
#include "SDL_log.h"
#endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC

1
src/video/wayland/SDL_waylandevents.c
View File

@ -25,7 +25,6 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_log.h"
#include "../../core/unix/SDL_poll.h" #include "../../core/unix/SDL_poll.h"
#include "../../events/SDL_sysevents.h" #include "../../events/SDL_sysevents.h"

1
src/video/wayland/SDL_waylandtouch.c
View File

@ -25,7 +25,6 @@
#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
#include "SDL_log.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"
#include "SDL_keyboard.h" #include "SDL_keyboard.h"
#include "SDL_waylandtouch.h" #include "SDL_waylandtouch.h"

1
src/video/windows/SDL_windowsmodes.c
View File

@ -24,7 +24,6 @@
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#include "../../../include/SDL_assert.h" #include "../../../include/SDL_assert.h"
#include "../../../include/SDL_log.h"
/* Windows CE compatibility */ /* Windows CE compatibility */
#ifndef CDS_FULLSCREEN #ifndef CDS_FULLSCREEN

1
src/video/windows/SDL_windowsopengles.c
View File

@ -25,7 +25,6 @@
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#include "SDL_windowsopengles.h" #include "SDL_windowsopengles.h"
#include "SDL_windowsopengl.h" #include "SDL_windowsopengl.h"
#include "SDL_log.h"
/* EGL implementation of SDL OpenGL support */ /* EGL implementation of SDL OpenGL support */

1
src/video/winrt/SDL_winrtmouse.cpp
View File

@ -39,7 +39,6 @@ extern "C" {
#include "../../events/SDL_touch_c.h" #include "../../events/SDL_touch_c.h"
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_log.h"
} }
#include "../../core/winrt/SDL_winrtapp_direct3d.h" #include "../../core/winrt/SDL_winrtapp_direct3d.h"

1
src/video/winrt/SDL_winrtvideo.cpp
View File

@ -67,7 +67,6 @@ extern "C" {
#include "SDL_winrtmouse_c.h" #include "SDL_winrtmouse_c.h"
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_system.h" #include "SDL_system.h"
//#include "SDL_log.h"
/* Initialization/Query functions */ /* Initialization/Query functions */

1
src/video/x11/SDL_x11window.c
View File

@ -40,7 +40,6 @@
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_log.h"
#define _NET_WM_STATE_REMOVE 0l #define _NET_WM_STATE_REMOVE 0l
#define _NET_WM_STATE_ADD 1l #define _NET_WM_STATE_ADD 1l