Skip to content

Commit 6a36a49

Browse files
pcbeardpcbeard
authored
Simplify #includes (#10)
With homebrew, `pgk-config --cflags` includes SDL2 in the search path, so need to be so explicit. Also, remove inclusion of begin_code.h, close_code.h. Those are bracketing headers only used by the other header files.
1 parent 868a567 commit 6a36a49

File tree

2 files changed

+126
-132
lines changed

2 files changed

+126
-132
lines changed

‎Sources/CSDL2/apple_macOS.h‎

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,63 @@
1-
#include "/usr/local/include/SDL2/SDL.h"
2-
#include "/usr/local/include/SDL2/SDL_assert.h"
3-
#include "/usr/local/include/SDL2/SDL_atomic.h"
4-
#include "/usr/local/include/SDL2/SDL_audio.h"
5-
#include "/usr/local/include/SDL2/SDL_bits.h"
6-
#include "/usr/local/include/SDL2/SDL_blendmode.h"
7-
#include "/usr/local/include/SDL2/SDL_clipboard.h"
8-
#include "/usr/local/include/SDL2/SDL_config.h"
9-
#include "/usr/local/include/SDL2/SDL_cpuinfo.h"
10-
#include "/usr/local/include/SDL2/SDL_endian.h"
11-
#include "/usr/local/include/SDL2/SDL_error.h"
12-
#include "/usr/local/include/SDL2/SDL_events.h"
13-
#include "/usr/local/include/SDL2/SDL_filesystem.h"
14-
#include "/usr/local/include/SDL2/SDL_gamecontroller.h"
15-
#include "/usr/local/include/SDL2/SDL_gesture.h"
16-
#include "/usr/local/include/SDL2/SDL_haptic.h"
17-
#include "/usr/local/include/SDL2/SDL_hints.h"
18-
#include "/usr/local/include/SDL2/SDL_joystick.h"
19-
#include "/usr/local/include/SDL2/SDL_keyboard.h"
20-
#include "/usr/local/include/SDL2/SDL_keycode.h"
21-
#include "/usr/local/include/SDL2/SDL_loadso.h"
22-
#include "/usr/local/include/SDL2/SDL_log.h"
23-
#include "/usr/local/include/SDL2/SDL_main.h"
24-
#include "/usr/local/include/SDL2/SDL_messagebox.h"
25-
#include "/usr/local/include/SDL2/SDL_mouse.h"
26-
#include "/usr/local/include/SDL2/SDL_mutex.h"
27-
#include "/usr/local/include/SDL2/SDL_name.h"
28-
#include "/usr/local/include/SDL2/SDL_opengl.h"
29-
#include "/usr/local/include/SDL2/SDL_opengl_glext.h"
30-
#include "/usr/local/include/SDL2/SDL_pixels.h"
31-
#include "/usr/local/include/SDL2/SDL_platform.h"
32-
#include "/usr/local/include/SDL2/SDL_power.h"
33-
#include "/usr/local/include/SDL2/SDL_quit.h"
34-
#include "/usr/local/include/SDL2/SDL_rect.h"
35-
#include "/usr/local/include/SDL2/SDL_render.h"
36-
#include "/usr/local/include/SDL2/SDL_revision.h"
37-
#include "/usr/local/include/SDL2/SDL_rwops.h"
38-
#include "/usr/local/include/SDL2/SDL_scancode.h"
39-
#include "/usr/local/include/SDL2/SDL_sensor.h"
40-
#include "/usr/local/include/SDL2/SDL_shape.h"
41-
#include "/usr/local/include/SDL2/SDL_stdinc.h"
42-
#include "/usr/local/include/SDL2/SDL_surface.h"
43-
#include "/usr/local/include/SDL2/SDL_system.h"
44-
#include "/usr/local/include/SDL2/SDL_syswm.h"
45-
#include "/usr/local/include/SDL2/SDL_test.h"
46-
#include "/usr/local/include/SDL2/SDL_test_assert.h"
47-
#include "/usr/local/include/SDL2/SDL_test_common.h"
48-
#include "/usr/local/include/SDL2/SDL_test_compare.h"
49-
#include "/usr/local/include/SDL2/SDL_test_crc32.h"
50-
#include "/usr/local/include/SDL2/SDL_test_font.h"
51-
#include "/usr/local/include/SDL2/SDL_test_fuzzer.h"
52-
#include "/usr/local/include/SDL2/SDL_test_harness.h"
53-
#include "/usr/local/include/SDL2/SDL_test_images.h"
54-
#include "/usr/local/include/SDL2/SDL_test_log.h"
55-
#include "/usr/local/include/SDL2/SDL_test_md5.h"
56-
#include "/usr/local/include/SDL2/SDL_test_memory.h"
57-
#include "/usr/local/include/SDL2/SDL_test_random.h"
58-
#include "/usr/local/include/SDL2/SDL_thread.h"
59-
#include "/usr/local/include/SDL2/SDL_timer.h"
60-
#include "/usr/local/include/SDL2/SDL_touch.h"
61-
#include "/usr/local/include/SDL2/SDL_types.h"
62-
#include "/usr/local/include/SDL2/SDL_version.h"
63-
#include "/usr/local/include/SDL2/SDL_video.h"
64-
#include "/usr/local/include/SDL2/SDL_vulkan.h"
65-
#include "/usr/local/include/SDL2/begin_code.h"
66-
#include "/usr/local/include/SDL2/close_code.h"
1+
#include <SDL.h>
2+
#include <SDL_assert.h>
3+
#include <SDL_atomic.h>
4+
#include <SDL_audio.h>
5+
#include <SDL_bits.h>
6+
#include <SDL_blendmode.h>
7+
#include <SDL_clipboard.h>
8+
#include <SDL_config.h>
9+
#include <SDL_cpuinfo.h>
10+
#include <SDL_endian.h>
11+
#include <SDL_error.h>
12+
#include <SDL_events.h>
13+
#include <SDL_filesystem.h>
14+
#include <SDL_gamecontroller.h>
15+
#include <SDL_gesture.h>
16+
#include <SDL_haptic.h>
17+
#include <SDL_hints.h>
18+
#include <SDL_joystick.h>
19+
#include <SDL_keyboard.h>
20+
#include <SDL_keycode.h>
21+
#include <SDL_loadso.h>
22+
#include <SDL_log.h>
23+
#include <SDL_main.h>
24+
#include <SDL_messagebox.h>
25+
#include <SDL_mouse.h>
26+
#include <SDL_mutex.h>
27+
#include <SDL_name.h>
28+
#include <SDL_opengl.h>
29+
#include <SDL_opengl_glext.h>
30+
#include <SDL_pixels.h>
31+
#include <SDL_platform.h>
32+
#include <SDL_power.h>
33+
#include <SDL_quit.h>
34+
#include <SDL_rect.h>
35+
#include <SDL_render.h>
36+
#include <SDL_revision.h>
37+
#include <SDL_rwops.h>
38+
#include <SDL_scancode.h>
39+
#include <SDL_shape.h>
40+
#include <SDL_stdinc.h>
41+
#include <SDL_surface.h>
42+
#include <SDL_system.h>
43+
#include <SDL_syswm.h>
44+
#include <SDL_test.h>
45+
#include <SDL_test_assert.h>
46+
#include <SDL_test_common.h>
47+
#include <SDL_test_compare.h>
48+
#include <SDL_test_crc32.h>
49+
#include <SDL_test_font.h>
50+
#include <SDL_test_fuzzer.h>
51+
#include <SDL_test_harness.h>
52+
#include <SDL_test_images.h>
53+
#include <SDL_test_log.h>
54+
#include <SDL_test_md5.h>
55+
#include <SDL_test_memory.h>
56+
#include <SDL_test_random.h>
57+
#include <SDL_thread.h>
58+
#include <SDL_timer.h>
59+
#include <SDL_touch.h>
60+
#include <SDL_types.h>
61+
#include <SDL_version.h>
62+
#include <SDL_video.h>
63+
#include <SDL_vulkan.h>

‎Sources/CSDL2/other_platforms.h‎

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,63 @@
1-
#include <SDL2/SDL.h>
2-
#include <SDL2/SDL_assert.h>
3-
#include <SDL2/SDL_atomic.h>
4-
#include <SDL2/SDL_audio.h>
5-
#include <SDL2/SDL_bits.h>
6-
#include <SDL2/SDL_blendmode.h>
7-
#include <SDL2/SDL_clipboard.h>
8-
#include <SDL2/SDL_config.h>
9-
#include <SDL2/SDL_cpuinfo.h>
10-
#include <SDL2/SDL_egl.h>
11-
#include <SDL2/SDL_endian.h>
12-
#include <SDL2/SDL_error.h>
13-
#include <SDL2/SDL_events.h>
14-
#include <SDL2/SDL_filesystem.h>
15-
#include <SDL2/SDL_gamecontroller.h>
16-
#include <SDL2/SDL_gesture.h>
17-
#include <SDL2/SDL_haptic.h>
18-
#include <SDL2/SDL_hints.h>
19-
#include <SDL2/SDL_joystick.h>
20-
#include <SDL2/SDL_keyboard.h>
21-
#include <SDL2/SDL_keycode.h>
22-
#include <SDL2/SDL_loadso.h>
23-
#include <SDL2/SDL_log.h>
24-
#include <SDL2/SDL_main.h>
25-
#include <SDL2/SDL_messagebox.h>
26-
#include <SDL2/SDL_mouse.h>
27-
#include <SDL2/SDL_mutex.h>
28-
#include <SDL2/SDL_name.h>
29-
#include <SDL2/SDL_opengl.h>
30-
#include <SDL2/SDL_opengl_glext.h>
31-
#include <SDL2/SDL_pixels.h>
32-
#include <SDL2/SDL_platform.h>
33-
#include <SDL2/SDL_power.h>
34-
#include <SDL2/SDL_quit.h>
35-
#include <SDL2/SDL_rect.h>
36-
#include <SDL2/SDL_render.h>
37-
#include <SDL2/SDL_revision.h>
38-
#include <SDL2/SDL_rwops.h>
39-
#include <SDL2/SDL_scancode.h>
40-
#include <SDL2/SDL_shape.h>
41-
#include <SDL2/SDL_stdinc.h>
42-
#include <SDL2/SDL_surface.h>
43-
#include <SDL2/SDL_system.h>
44-
#include <SDL2/SDL_syswm.h>
45-
#include <SDL2/SDL_test.h>
46-
#include <SDL2/SDL_test_assert.h>
47-
#include <SDL2/SDL_test_common.h>
48-
#include <SDL2/SDL_test_compare.h>
49-
#include <SDL2/SDL_test_crc32.h>
50-
#include <SDL2/SDL_test_font.h>
51-
#include <SDL2/SDL_test_fuzzer.h>
52-
#include <SDL2/SDL_test_harness.h>
53-
#include <SDL2/SDL_test_images.h>
54-
#include <SDL2/SDL_test_log.h>
55-
#include <SDL2/SDL_test_md5.h>
56-
#include <SDL2/SDL_test_memory.h>
57-
#include <SDL2/SDL_test_random.h>
58-
#include <SDL2/SDL_thread.h>
59-
#include <SDL2/SDL_timer.h>
60-
#include <SDL2/SDL_touch.h>
61-
#include <SDL2/SDL_types.h>
62-
#include <SDL2/SDL_version.h>
63-
#include <SDL2/SDL_video.h>
64-
#include <SDL2/SDL_vulkan.h>
65-
#include <SDL2/begin_code.h>
66-
#include <SDL2/close_code.h>
1+
#include <SDL.h>
2+
#include <SDL_assert.h>
3+
#include <SDL_atomic.h>
4+
#include <SDL_audio.h>
5+
#include <SDL_bits.h>
6+
#include <SDL_blendmode.h>
7+
#include <SDL_clipboard.h>
8+
#include <SDL_config.h>
9+
#include <SDL_cpuinfo.h>
10+
#include <SDL_endian.h>
11+
#include <SDL_error.h>
12+
#include <SDL_events.h>
13+
#include <SDL_filesystem.h>
14+
#include <SDL_gamecontroller.h>
15+
#include <SDL_gesture.h>
16+
#include <SDL_haptic.h>
17+
#include <SDL_hints.h>
18+
#include <SDL_joystick.h>
19+
#include <SDL_keyboard.h>
20+
#include <SDL_keycode.h>
21+
#include <SDL_loadso.h>
22+
#include <SDL_log.h>
23+
#include <SDL_main.h>
24+
#include <SDL_messagebox.h>
25+
#include <SDL_mouse.h>
26+
#include <SDL_mutex.h>
27+
#include <SDL_name.h>
28+
#include <SDL_opengl.h>
29+
#include <SDL_opengl_glext.h>
30+
#include <SDL_pixels.h>
31+
#include <SDL_platform.h>
32+
#include <SDL_power.h>
33+
#include <SDL_quit.h>
34+
#include <SDL_rect.h>
35+
#include <SDL_render.h>
36+
#include <SDL_revision.h>
37+
#include <SDL_rwops.h>
38+
#include <SDL_scancode.h>
39+
#include <SDL_shape.h>
40+
#include <SDL_stdinc.h>
41+
#include <SDL_surface.h>
42+
#include <SDL_system.h>
43+
#include <SDL_syswm.h>
44+
#include <SDL_test.h>
45+
#include <SDL_test_assert.h>
46+
#include <SDL_test_common.h>
47+
#include <SDL_test_compare.h>
48+
#include <SDL_test_crc32.h>
49+
#include <SDL_test_font.h>
50+
#include <SDL_test_fuzzer.h>
51+
#include <SDL_test_harness.h>
52+
#include <SDL_test_images.h>
53+
#include <SDL_test_log.h>
54+
#include <SDL_test_md5.h>
55+
#include <SDL_test_memory.h>
56+
#include <SDL_test_random.h>
57+
#include <SDL_thread.h>
58+
#include <SDL_timer.h>
59+
#include <SDL_touch.h>
60+
#include <SDL_types.h>
61+
#include <SDL_version.h>
62+
#include <SDL_video.h>
63+
#include <SDL_vulkan.h>

0 commit comments

Comments
 (0)