Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Added a simple log message API
  • Loading branch information
slouken committed Feb 8, 2011
1 parent 0b69bdc commit 564ad83
Show file tree
Hide file tree
Showing 13 changed files with 549 additions and 33 deletions.
1 change: 1 addition & 0 deletions Makefile.in
Expand Up @@ -59,6 +59,7 @@ HDRS = \
SDL_keyboard.h \
SDL_keysym.h \
SDL_loadso.h \
SDL_log.h \
SDL_main.h \
SDL_mouse.h \
SDL_mutex.h \
Expand Down
8 changes: 8 additions & 0 deletions VisualC/SDL/SDL_VS2008.vcproj
Expand Up @@ -457,6 +457,10 @@
RelativePath="..\..\include\SDL_loadso.h"
>
</File>
<File
RelativePath="..\..\include\SDL_log.h"
>
</File>
<File
RelativePath="..\..\include\SDL_main.h"
>
Expand Down Expand Up @@ -918,6 +922,10 @@
RelativePath="..\..\src\video\SDL_leaks.h"
>
</File>
<File
RelativePath="..\..\src\SDL_log.c"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_malloc.c"
>
Expand Down
2 changes: 2 additions & 0 deletions VisualC/SDL/SDL_VS2010.vcxproj
Expand Up @@ -249,6 +249,7 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClInclude Include="..\..\include\SDL_keyboard.h" />
<ClInclude Include="..\..\include\SDL_keysym.h" />
<ClInclude Include="..\..\include\SDL_loadso.h" />
<ClInclude Include="..\..\include\SDL_log.h" />
<ClInclude Include="..\..\include\SDL_main.h" />
<ClInclude Include="..\..\include\SDL_mouse.h" />
<ClInclude Include="..\..\include\SDL_mutex.h" />
Expand Down Expand Up @@ -390,6 +391,7 @@ echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_r
<ClCompile Include="..\..\src\audio\SDL_audiodev.c" />
<ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />
<ClCompile Include="..\..\src\SDL_hints.c" />
<ClCompile Include="..\..\src\SDL_log.c" />
<ClCompile Include="..\..\src\video\dummy\SDL_nullframebuffer.c" />
<ClCompile Include="..\..\src\video\SDL_blit.c" />
<ClCompile Include="..\..\src\video\SDL_blit_0.c" />
Expand Down
42 changes: 41 additions & 1 deletion VisualCE/SDL/SDL.vcproj
Expand Up @@ -877,6 +877,10 @@
RelativePath="..\..\src\haptic\SDL_haptic.c"
>
</File>
<File
RelativePath="..\..\src\SDL_hints.c"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_iconv.c"
>
Expand All @@ -889,6 +893,10 @@
RelativePath="..\..\src\events\SDL_keyboard.c"
>
</File>
<File
RelativePath="..\..\src\SDL_log.c"
>
</File>
<File
RelativePath="..\..\src\stdlib\SDL_malloc.c"
>
Expand Down Expand Up @@ -938,7 +946,7 @@
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_renderer_sw.c"
RelativePath="..\..\src\render\software\SDL_render_sw.c"
>
</File>
<File
Expand Down Expand Up @@ -1230,18 +1238,46 @@
RelativePath="..\..\src\haptic\SDL_haptic_c.h"
>
</File>
<File
RelativePath="..\..\include\SDL_hints.h"
>
</File>
<File
RelativePath="..\..\include\SDL_input.h"
>
</File>
<File
RelativePath="..\..\include\SDL_joystick.h"
>
</File>
<File
RelativePath="..\..\src\joystick\SDL_joystick_c.h"
>
</File>
<File
RelativePath="..\..\include\SDL_keyboard.h"
>
</File>
<File
RelativePath="..\..\src\events\SDL_keyboard_c.h"
>
</File>
<File
RelativePath="..\..\include\SDL_keysym.h"
>
</File>
<File
RelativePath="..\..\src\video\SDL_leaks.h"
>
</File>
<File
RelativePath="..\..\include\SDL_loadso.h"
>
</File>
<File
RelativePath="..\..\include\SDL_log.h"
>
</File>
<File
RelativePath="..\..\src\events\SDL_mouse_c.h"
>
Expand Down Expand Up @@ -1270,6 +1306,10 @@
RelativePath="..\..\src\video\SDL_rect_c.h"
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_render_sw_c.h"
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_renderer_sw_c.h"
>
Expand Down
12 changes: 12 additions & 0 deletions Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
Expand Up @@ -99,6 +99,9 @@
04BA9D6611EF474A00B60E01 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BA9D6211EF474A00B60E01 /* SDL_touch.c */; };
04BA9D7D11EF497E00B60E01 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BA9D7B11EF497E00B60E01 /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
04BA9D7E11EF497E00B60E01 /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BA9D7C11EF497E00B60E01 /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
04BAC0991300C0F70055DE28 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BAC0981300C0F70055DE28 /* SDL_log.h */; };
04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BAC09A1300C1290055DE28 /* SDL_assert_c.h */; };
04BAC09D1300C1290055DE28 /* SDL_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BAC09B1300C1290055DE28 /* SDL_log.c */; };
04EC8B521025D12900431D42 /* SDL_config_iphoneos.h in Headers */ = {isa = PBXBuildFile; fileRef = 04EC8B501025D12900431D42 /* SDL_config_iphoneos.h */; settings = {ATTRIBUTES = (Public, ); }; };
04F2AF541104ABC300D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF531104ABC300D6DDF7 /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */; };
Expand Down Expand Up @@ -362,6 +365,9 @@
04BA9D6211EF474A00B60E01 /* SDL_touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_touch.c; sourceTree = "<group>"; };
04BA9D7B11EF497E00B60E01 /* SDL_gesture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_gesture.h; path = ../../include/SDL_gesture.h; sourceTree = SOURCE_ROOT; };
04BA9D7C11EF497E00B60E01 /* SDL_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_touch.h; path = ../../include/SDL_touch.h; sourceTree = SOURCE_ROOT; };
04BAC0981300C0F70055DE28 /* SDL_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_log.h; path = ../../include/SDL_log.h; sourceTree = SOURCE_ROOT; };
04BAC09A1300C1290055DE28 /* SDL_assert_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert_c.h; path = ../../src/SDL_assert_c.h; sourceTree = SOURCE_ROOT; };
04BAC09B1300C1290055DE28 /* SDL_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_log.c; path = ../../src/SDL_log.c; sourceTree = SOURCE_ROOT; };
04EC8B501025D12900431D42 /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_config_iphoneos.h; path = ../../include/SDL_config_iphoneos.h; sourceTree = SOURCE_ROOT; };
04F2AF531104ABC300D6DDF7 /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert.h; path = ../../include/SDL_assert.h; sourceTree = SOURCE_ROOT; };
04F2AF551104ABD200D6DDF7 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -930,6 +936,7 @@
FD99B8DF0DD52EB400FB1D6B /* SDL_keyboard.h */,
FD99B8E00DD52EB400FB1D6B /* SDL_keysym.h */,
FD99B8E10DD52EB400FB1D6B /* SDL_loadso.h */,
04BAC0981300C0F70055DE28 /* SDL_log.h */,
FD99B8E20DD52EB400FB1D6B /* SDL_main.h */,
FD99B8E30DD52EB400FB1D6B /* SDL_mouse.h */,
FD99B8E40DD52EB400FB1D6B /* SDL_mutex.h */,
Expand Down Expand Up @@ -978,12 +985,14 @@
FD99BA1E0DD52EDC00FB1D6B /* timer */,
FDA682420DF2374D00F98A1A /* video */,
04F2AF551104ABD200D6DDF7 /* SDL_assert.c */,
04BAC09A1300C1290055DE28 /* SDL_assert_c.h */,
FD99B9D30DD52EDC00FB1D6B /* SDL_compat.c */,
FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */,
FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */,
FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */,
FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */,
0442EC5412FE1C3F004C9285 /* SDL_hints.c */,
04BAC09B1300C1290055DE28 /* SDL_log.c */,
FD99B9D80DD52EDC00FB1D6B /* SDL.c */,
);
name = "Library Source";
Expand Down Expand Up @@ -1260,6 +1269,8 @@
0442EC5012FE1C1E004C9285 /* SDL_render_sw_c.h in Headers */,
0402A85A12FE70C600CECEE3 /* SDL_shaders_gles2.h in Headers */,
04043B8D12FEA9350076DB1F /* SDL_opengles2.h in Headers */,
04BAC0991300C0F70055DE28 /* SDL_log.h in Headers */,
04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1509,6 +1520,7 @@
0442EC5512FE1C3F004C9285 /* SDL_hints.c in Sources */,
0402A85812FE70C600CECEE3 /* SDL_render_gles2.c in Sources */,
0402A85912FE70C600CECEE3 /* SDL_shaders_gles2.c in Sources */,
04BAC09D1300C1290055DE28 /* SDL_log.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
12 changes: 12 additions & 0 deletions Xcode/SDL/SDL.xcodeproj/project.pbxproj
Expand Up @@ -155,6 +155,10 @@
044E5F8611E6051C0076F181 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 044E5F8411E6051C0076F181 /* SDL_clipboard.h */; };
0469A10B12EE4BF100B846D6 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10912EE4BF100B846D6 /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
0469A10D12EE4BF100B846D6 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10912EE4BF100B846D6 /* SDL_blendmode.h */; };
04BAC0B31300C1CB0055DE28 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BAC0B21300C1CB0055DE28 /* SDL_log.h */; };
04BAC0B41300C1CB0055DE28 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BAC0B21300C1CB0055DE28 /* SDL_log.h */; };
04BAC0C81300C2160055DE28 /* SDL_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BAC0C71300C2160055DE28 /* SDL_log.c */; };
04BAC0C91300C2160055DE28 /* SDL_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BAC0C71300C2160055DE28 /* SDL_log.c */; };
04BD000812E6671800899322 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; };
04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; };
04BD001012E6671800899322 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; };
Expand Down Expand Up @@ -709,6 +713,8 @@
0442EC5E12FE1C75004C9285 /* SDL_hints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_hints.c; path = ../../src/SDL_hints.c; sourceTree = SOURCE_ROOT; };
044E5F8411E6051C0076F181 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../include/SDL_clipboard.h; sourceTree = SOURCE_ROOT; };
0469A10912EE4BF100B846D6 /* SDL_blendmode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_blendmode.h; path = ../../include/SDL_blendmode.h; sourceTree = SOURCE_ROOT; };
04BAC0B21300C1CB0055DE28 /* SDL_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_log.h; path = ../../include/SDL_log.h; sourceTree = SOURCE_ROOT; };
04BAC0C71300C2160055DE28 /* SDL_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_log.c; path = ../../src/SDL_log.c; sourceTree = SOURCE_ROOT; };
04BDFD7412E6671700899322 /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = "<group>"; };
04BDFD7512E6671700899322 /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; };
04BDFD8812E6671700899322 /* SDL_diskaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_diskaudio.c; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1137,6 +1143,7 @@
0C5AF5F101191D2B7F000001 /* SDL_keyboard.h */,
0C5AF5F201191D2B7F000001 /* SDL_keysym.h */,
B29A290D04E5B28700A80002 /* SDL_loadso.h */,
04BAC0B21300C1CB0055DE28 /* SDL_log.h */,
0C5AF5F301191D2B7F000001 /* SDL_main.h */,
0C5AF5F401191D2B7F000001 /* SDL_mouse.h */,
0C5AF5F501191D2B7F000001 /* SDL_mutex.h */,
Expand Down Expand Up @@ -1722,6 +1729,7 @@
04BDFE5A12E6671700899322 /* SDL_fatal.c */,
04BDFE5B12E6671700899322 /* SDL_fatal.h */,
0442EC5E12FE1C75004C9285 /* SDL_hints.c */,
04BAC0C71300C2160055DE28 /* SDL_log.c */,
04BDFE5C12E6671700899322 /* SDL.c */,
);
name = "Library Source";
Expand Down Expand Up @@ -1932,6 +1940,7 @@
0442EC1C12FE1BCB004C9285 /* SDL_render_sw_c.h in Headers */,
0442EC5B12FE1C60004C9285 /* SDL_x11framebuffer.h in Headers */,
04043BBB12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
04BAC0B31300C1CB0055DE28 /* SDL_log.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2061,6 +2070,7 @@
0442EC1E12FE1BCB004C9285 /* SDL_render_sw_c.h in Headers */,
0442EC5D12FE1C60004C9285 /* SDL_x11framebuffer.h in Headers */,
04043BBC12FEB1BE0076DB1F /* SDL_glfuncs.h in Headers */,
04BAC0B41300C1CB0055DE28 /* SDL_log.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2431,6 +2441,7 @@
0442EC1D12FE1BCB004C9285 /* SDL_render_sw.c in Sources */,
0442EC5A12FE1C60004C9285 /* SDL_x11framebuffer.c in Sources */,
0442EC5F12FE1C75004C9285 /* SDL_hints.c in Sources */,
04BAC0C81300C2160055DE28 /* SDL_log.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2550,6 +2561,7 @@
0442EC1F12FE1BCB004C9285 /* SDL_render_sw.c in Sources */,
0442EC5C12FE1C60004C9285 /* SDL_x11framebuffer.c in Sources */,
0442EC6012FE1C75004C9285 /* SDL_hints.c in Sources */,
04BAC0C91300C2160055DE28 /* SDL_log.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 1 addition & 0 deletions include/SDL.h
Expand Up @@ -81,6 +81,7 @@
#include "SDL_events.h"
#include "SDL_hints.h"
#include "SDL_loadso.h"
#include "SDL_log.h"
#include "SDL_mutex.h"
#include "SDL_power.h"
#include "SDL_render.h"
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_error.h
Expand Up @@ -48,7 +48,7 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
* \name Internal error functions
*
* \internal
* Private error message function - used internally.
* Private error reporting function - used internally.
*/
/*@{*/
#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM)
Expand Down

0 comments on commit 564ad83

Please sign in to comment.