Skip to content

Commit

Permalink
Added SDL_log.h to SDL_internal.h so logging is available everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Apr 7, 2020
1 parent 488b94c commit b6afbe6
Show file tree
Hide file tree
Showing 49 changed files with 4 additions and 53 deletions.
1 change: 0 additions & 1 deletion src/SDL_error.c
View file
Expand Up @@ -22,7 +22,6 @@

/* Simple error handling in SDL */

#include "SDL_log.h"
#include "SDL_error.h"
#include "SDL_error_c.h"

Expand Down
2 changes: 2 additions & 0 deletions src/SDL_internal.h
View file
Expand Up @@ -116,6 +116,8 @@
#define SDL_HAVE_YUV !SDL_LEAN_AND_MEAN
#endif

#include "SDL_log.h"

#endif /* SDL_internal_h_ */

/* vi: set ts=4 sw=4 expandtab: */
1 change: 0 additions & 1 deletion src/audio/SDL_wave.c
View file
Expand Up @@ -34,7 +34,6 @@

/* Microsoft WAVE file loading routines */

#include "SDL_log.h"
#include "SDL_hints.h"
#include "SDL_audio.h"
#include "SDL_wave.h"
Expand Down
1 change: 0 additions & 1 deletion src/audio/disk/SDL_diskaudio.c
View file
Expand Up @@ -33,7 +33,6 @@
#include "SDL_audio.h"
#include "../SDL_audio_c.h"
#include "SDL_diskaudio.h"
#include "SDL_log.h"

/* !!! FIXME: these should be SDL hints, not environment variables. */
/* environment variables and defaults. */
Expand Down
1 change: 0 additions & 1 deletion src/audio/emscripten/SDL_emscriptenaudio.c
View file
Expand Up @@ -23,7 +23,6 @@
#if SDL_AUDIO_DRIVER_EMSCRIPTEN

#include "SDL_audio.h"
#include "SDL_log.h"
#include "../SDL_audio_c.h"
#include "SDL_emscriptenaudio.h"
#include "SDL_assert.h"
Expand Down
1 change: 0 additions & 1 deletion src/audio/wasapi/SDL_wasapi.c
View file
Expand Up @@ -29,7 +29,6 @@
#include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h"
#include "SDL_assert.h"
#include "SDL_log.h"

#define COBJMACROS
#include <mmdeviceapi.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/wasapi/SDL_wasapi_win32.c
View file
Expand Up @@ -35,7 +35,6 @@
#include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h"
#include "SDL_assert.h"
#include "SDL_log.h"

#define COBJMACROS
#include <mmdeviceapi.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/wasapi/SDL_wasapi_winrt.cpp
View file
Expand Up @@ -41,7 +41,6 @@ extern "C" {
#include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h"
#include "SDL_assert.h"
#include "SDL_log.h"
}

#define COBJMACROS
Expand Down
2 changes: 1 addition & 1 deletion src/core/android/SDL_android.c
View file
Expand Up @@ -19,11 +19,11 @@
3. This notice may not be removed or altered from any source distribution.
*/
#include "../../SDL_internal.h"

#include "SDL_stdinc.h"
#include "SDL_assert.h"
#include "SDL_atomic.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_main.h"
#include "SDL_timer.h"

Expand Down
1 change: 0 additions & 1 deletion src/core/winrt/SDL_winrtapp_direct3d.cpp
View file
Expand Up @@ -50,7 +50,6 @@ extern "C" {
#include "SDL_assert.h"
#include "SDL_events.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_main.h"
#include "SDL_stdinc.h"
#include "SDL_render.h"
Expand Down
1 change: 0 additions & 1 deletion src/filesystem/cocoa/SDL_sysfilesystem.m
View file
Expand Up @@ -32,7 +32,6 @@
#include "SDL_error.h"
#include "SDL_stdinc.h"
#include "SDL_filesystem.h"
#include "SDL_log.h"

char *
SDL_GetBasePath(void)
Expand Down
1 change: 0 additions & 1 deletion src/joystick/android/SDL_sysjoystick.c
View file
Expand Up @@ -31,7 +31,6 @@
#include "SDL_hints.h"
#include "SDL_assert.h"
#include "SDL_timer.h"
#include "SDL_log.h"
#include "SDL_sysjoystick_c.h"
#include "../SDL_joystick_c.h"
#include "../../events/SDL_keyboard_c.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/emscripten/SDL_sysjoystick.c
View file
Expand Up @@ -30,7 +30,6 @@
#include "SDL_joystick.h"
#include "SDL_assert.h"
#include "SDL_timer.h"
#include "SDL_log.h"
#include "SDL_sysjoystick_c.h"
#include "../SDL_joystick_c.h"

Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_gamecube.c
View file
Expand Up @@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_haptic.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_ps4.c
View file
Expand Up @@ -26,7 +26,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_steam.c
View file
Expand Up @@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_switch.c
View file
Expand Up @@ -26,7 +26,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_xbox360.c
View file
Expand Up @@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_xbox360w.c
View file
Expand Up @@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapi_xboxone.c
View file
Expand Up @@ -23,7 +23,6 @@
#ifdef SDL_JOYSTICK_HIDAPI

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_events.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/hidapi/SDL_hidapijoystick.c
View file
Expand Up @@ -26,7 +26,6 @@
#include "SDL_atomic.h"
#include "SDL_endian.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_thread.h"
#include "SDL_timer.h"
#include "SDL_joystick.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/windows/SDL_rawinputjoystick.c
View file
Expand Up @@ -36,7 +36,6 @@
#include "SDL_assert.h"
#include "SDL_endian.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_mutex.h"
#include "../SDL_sysjoystick.h"
#include "../../core/windows/SDL_windows.h"
Expand Down
1 change: 0 additions & 1 deletion src/joystick/windows/SDL_xinputjoystick.c
View file
Expand Up @@ -26,7 +26,6 @@

#include "SDL_assert.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_timer.h"
#include "SDL_windowsjoystick_c.h"
#include "SDL_xinputjoystick_c.h"
Expand Down
1 change: 0 additions & 1 deletion src/render/SDL_render.c
View file
Expand Up @@ -24,7 +24,6 @@

#include "SDL_assert.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_render.h"
#include "SDL_sysrender.h"
#include "software/SDL_render_sw_c.h"
Expand Down
1 change: 0 additions & 1 deletion src/render/direct3d/SDL_render_d3d.c
View file
Expand Up @@ -30,7 +30,6 @@
#include "SDL_hints.h"
#include "SDL_loadso.h"
#include "SDL_syswm.h"
#include "SDL_log.h"
#include "SDL_assert.h"
#include "../SDL_sysrender.h"
#include "../SDL_d3dmath.h"
Expand Down
1 change: 0 additions & 1 deletion src/render/metal/SDL_render_metal.m
View file
Expand Up @@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_assert.h"
#include "SDL_syswm.h"
#include "SDL_metal.h"
Expand Down
1 change: 0 additions & 1 deletion src/render/opengl/SDL_render_gl.c
View file
Expand Up @@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED

#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_assert.h"
#include "SDL_opengl.h"
#include "../SDL_sysrender.h"
Expand Down
1 change: 0 additions & 1 deletion src/render/opengl/SDL_shaders_gl.c
View file
Expand Up @@ -23,7 +23,6 @@
#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED

#include "SDL_stdinc.h"
#include "SDL_log.h"
#include "SDL_opengl.h"
#include "SDL_video.h"
#include "SDL_shaders_gl.h"
Expand Down
1 change: 0 additions & 1 deletion src/thread/pthread/SDL_systhread.c
View file
Expand Up @@ -47,7 +47,6 @@
#endif
#endif

#include "SDL_log.h"
#include "SDL_platform.h"
#include "SDL_thread.h"
#include "../SDL_thread_c.h"
Expand Down
1 change: 0 additions & 1 deletion src/thread/stdcpp/SDL_sysmutex.cpp
View file
Expand Up @@ -23,7 +23,6 @@
extern "C" {
#include "SDL_thread.h"
#include "SDL_systhread_c.h"
#include "SDL_log.h"
}

#include <system_error>
Expand Down
1 change: 0 additions & 1 deletion src/thread/stdcpp/SDL_systhread.cpp
View file
Expand Up @@ -26,7 +26,6 @@ extern "C" {
#include "SDL_thread.h"
#include "../SDL_thread_c.h"
#include "../SDL_systhread.h"
#include "SDL_log.h"
}

#include <mutex>
Expand Down
1 change: 0 additions & 1 deletion src/video/SDL_egl.c
View file
Expand Up @@ -31,7 +31,6 @@
#endif

#include "SDL_sysvideo.h"
#include "SDL_log.h"
#include "SDL_egl_c.h"
#include "SDL_loadso.h"
#include "SDL_hints.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/SDL_vulkan_utils.c
View file
Expand Up @@ -22,7 +22,6 @@

#include "SDL_vulkan_internal.h"
#include "SDL_error.h"
#include "SDL_log.h"

/* !!! FIXME: this file doesn't match coding standards for SDL (brace position, etc). */

Expand Down
1 change: 0 additions & 1 deletion src/video/android/SDL_androidtouch.c
View file
Expand Up @@ -26,7 +26,6 @@

#include "SDL_hints.h"
#include "SDL_events.h"
#include "SDL_log.h"
#include "SDL_androidtouch.h"
#include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_touch_c.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/cocoa/SDL_cocoaopengles.m
View file
Expand Up @@ -25,7 +25,6 @@
#include "SDL_cocoavideo.h"
#include "SDL_cocoaopengles.h"
#include "SDL_cocoaopengl.h"
#include "SDL_log.h"

/* EGL implementation of SDL OpenGL support */

Expand Down
1 change: 0 additions & 1 deletion src/video/directfb/SDL_DirectFB_video.h
View file
Expand Up @@ -31,7 +31,6 @@
#include "SDL_scancode.h"
#include "SDL_render.h"

#include "SDL_log.h"

#define DFB_VERSIONNUM(X, Y, Z) \
((X)*1000 + (Y)*100 + (Z))
Expand Down
3 changes: 0 additions & 3 deletions src/video/kmsdrm/SDL_kmsdrmdyn.c
View file
Expand Up @@ -27,9 +27,6 @@

#include "SDL_kmsdrmdyn.h"

#if DEBUG_DYNAMIC_KMSDRM
#include "SDL_log.h"
#endif

#ifdef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC

Expand Down
2 changes: 0 additions & 2 deletions src/video/kmsdrm/SDL_kmsdrmopengles.c
View file
Expand Up @@ -23,8 +23,6 @@

#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL

#include "SDL_log.h"

#include "SDL_kmsdrmvideo.h"
#include "SDL_kmsdrmopengles.h"
#include "SDL_kmsdrmdyn.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/kmsdrm/SDL_kmsdrmvideo.c
View file
Expand Up @@ -26,7 +26,6 @@
/* SDL internals */
#include "../SDL_sysvideo.h"
#include "SDL_syswm.h"
#include "SDL_log.h"
#include "SDL_hints.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_mouse_c.h"
Expand Down
2 changes: 1 addition & 1 deletion src/video/raspberry/SDL_rpiopengles.c
View file
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/
#include "../../SDL_internal.h"

#include "SDL_hints.h"
#include "SDL_log.h"

#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL

Expand Down
1 change: 0 additions & 1 deletion src/video/vivante/SDL_vivantevulkan.c
View file
Expand Up @@ -35,7 +35,6 @@
#include "SDL_loadso.h"
#include "SDL_vivantevulkan.h"
#include "SDL_syswm.h"
#include "SDL_log.h"

int VIVANTE_Vulkan_LoadLibrary(_THIS, const char *path)
{
Expand Down
3 changes: 0 additions & 3 deletions src/video/wayland/SDL_waylanddyn.c
View file
Expand Up @@ -26,9 +26,6 @@

#include "SDL_waylanddyn.h"

#if DEBUG_DYNAMIC_WAYLAND
#include "SDL_log.h"
#endif

#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC

Expand Down
1 change: 0 additions & 1 deletion src/video/wayland/SDL_waylandevents.c
View file
Expand Up @@ -25,7 +25,6 @@

#include "SDL_stdinc.h"
#include "SDL_assert.h"
#include "SDL_log.h"

#include "../../core/unix/SDL_poll.h"
#include "../../events/SDL_sysevents.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/wayland/SDL_waylandtouch.c
View file
Expand Up @@ -25,7 +25,6 @@

#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH

#include "SDL_log.h"
#include "SDL_mouse.h"
#include "SDL_keyboard.h"
#include "SDL_waylandtouch.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/windows/SDL_windowsmodes.c
View file
Expand Up @@ -24,7 +24,6 @@

#include "SDL_windowsvideo.h"
#include "../../../include/SDL_assert.h"
#include "../../../include/SDL_log.h"

/* Windows CE compatibility */
#ifndef CDS_FULLSCREEN
Expand Down
1 change: 0 additions & 1 deletion src/video/windows/SDL_windowsopengles.c
View file
Expand Up @@ -25,7 +25,6 @@
#include "SDL_windowsvideo.h"
#include "SDL_windowsopengles.h"
#include "SDL_windowsopengl.h"
#include "SDL_log.h"

/* EGL implementation of SDL OpenGL support */

Expand Down
1 change: 0 additions & 1 deletion src/video/winrt/SDL_winrtmouse.cpp
View file
Expand Up @@ -39,7 +39,6 @@ extern "C" {
#include "../../events/SDL_touch_c.h"
#include "../SDL_sysvideo.h"
#include "SDL_events.h"
#include "SDL_log.h"
}

#include "../../core/winrt/SDL_winrtapp_direct3d.h"
Expand Down
1 change: 0 additions & 1 deletion src/video/winrt/SDL_winrtvideo.cpp
View file
Expand Up @@ -67,7 +67,6 @@ extern "C" {
#include "SDL_winrtmouse_c.h"
#include "SDL_main.h"
#include "SDL_system.h"
//#include "SDL_log.h"


/* Initialization/Query functions */
Expand Down

0 comments on commit b6afbe6

Please sign in to comment.