gosu 1.3.0 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (204) hide show
  1. checksums.yaml +4 -4
  2. data/dependencies/SDL/include/SDL.h +108 -14
  3. data/dependencies/SDL/include/SDL_assert.h +81 -50
  4. data/dependencies/SDL/include/SDL_atomic.h +135 -35
  5. data/dependencies/SDL/include/SDL_audio.h +960 -355
  6. data/dependencies/SDL/include/SDL_bits.h +11 -6
  7. data/dependencies/SDL/include/SDL_blendmode.h +91 -14
  8. data/dependencies/SDL/include/SDL_clipboard.h +30 -7
  9. data/dependencies/SDL/include/SDL_config.h +277 -27
  10. data/dependencies/SDL/include/SDL_config_android.h +13 -38
  11. data/dependencies/SDL/include/SDL_config_iphoneos.h +21 -62
  12. data/dependencies/SDL/include/SDL_config_macosx.h +23 -92
  13. data/dependencies/SDL/include/SDL_config_minimal.h +1 -4
  14. data/dependencies/SDL/include/SDL_config_pandora.h +15 -22
  15. data/dependencies/SDL/include/SDL_config_psp.h +16 -37
  16. data/dependencies/SDL/include/SDL_config_windows.h +28 -91
  17. data/dependencies/SDL/include/SDL_config_winrt.h +33 -61
  18. data/dependencies/SDL/include/SDL_config_wiz.h +28 -56
  19. data/dependencies/SDL/include/SDL_copying.h +1 -1
  20. data/dependencies/SDL/include/SDL_cpuinfo.h +331 -71
  21. data/dependencies/SDL/include/SDL_egl.h +906 -280
  22. data/dependencies/SDL/include/SDL_endian.h +101 -47
  23. data/dependencies/SDL/include/SDL_error.h +70 -19
  24. data/dependencies/SDL/include/SDL_events.h +387 -79
  25. data/dependencies/SDL/include/SDL_filesystem.h +73 -64
  26. data/dependencies/SDL/include/SDL_gamecontroller.h +585 -125
  27. data/dependencies/SDL/include/SDL_gesture.h +36 -6
  28. data/dependencies/SDL/include/SDL_haptic.h +304 -210
  29. data/dependencies/SDL/include/SDL_hidapi.h +451 -0
  30. data/dependencies/SDL/include/SDL_hints.h +1286 -897
  31. data/dependencies/SDL/include/SDL_joystick.h +577 -130
  32. data/dependencies/SDL/include/SDL_keyboard.h +162 -63
  33. data/dependencies/SDL/include/SDL_keycode.h +7 -5
  34. data/dependencies/SDL/include/SDL_loadso.h +42 -8
  35. data/dependencies/SDL/include/SDL_locale.h +34 -32
  36. data/dependencies/SDL/include/SDL_log.h +212 -19
  37. data/dependencies/SDL/include/SDL_main.h +72 -17
  38. data/dependencies/SDL/include/SDL_messagebox.h +70 -23
  39. data/dependencies/SDL/include/SDL_metal.h +27 -32
  40. data/dependencies/SDL/include/SDL_misc.h +19 -15
  41. data/dependencies/SDL/include/SDL_mouse.h +262 -110
  42. data/dependencies/SDL/include/SDL_mutex.h +286 -66
  43. data/dependencies/SDL/include/SDL_name.h +1 -1
  44. data/dependencies/SDL/include/SDL_opengl.h +1 -1
  45. data/dependencies/SDL/include/SDL_opengles.h +1 -1
  46. data/dependencies/SDL/include/SDL_opengles2.h +2 -2
  47. data/dependencies/SDL/include/SDL_pixels.h +199 -34
  48. data/dependencies/SDL/include/SDL_platform.h +39 -2
  49. data/dependencies/SDL/include/SDL_power.h +23 -10
  50. data/dependencies/SDL/include/SDL_quit.h +1 -1
  51. data/dependencies/SDL/include/SDL_rect.h +78 -28
  52. data/dependencies/SDL/include/SDL_render.h +1204 -472
  53. data/dependencies/SDL/include/SDL_revision.h +2 -2
  54. data/dependencies/SDL/include/SDL_rwops.h +605 -33
  55. data/dependencies/SDL/include/SDL_scancode.h +1 -1
  56. data/dependencies/SDL/include/SDL_sensor.h +76 -42
  57. data/dependencies/SDL/include/SDL_shape.h +38 -27
  58. data/dependencies/SDL/include/SDL_stdinc.h +96 -24
  59. data/dependencies/SDL/include/SDL_surface.h +571 -139
  60. data/dependencies/SDL/include/SDL_system.h +339 -101
  61. data/dependencies/SDL/include/SDL_syswm.h +50 -20
  62. data/dependencies/SDL/include/SDL_test.h +1 -1
  63. data/dependencies/SDL/include/SDL_test_assert.h +2 -2
  64. data/dependencies/SDL/include/SDL_test_common.h +23 -6
  65. data/dependencies/SDL/include/SDL_test_compare.h +1 -1
  66. data/dependencies/SDL/include/SDL_test_crc32.h +1 -1
  67. data/dependencies/SDL/include/SDL_test_font.h +3 -3
  68. data/dependencies/SDL/include/SDL_test_fuzzer.h +28 -26
  69. data/dependencies/SDL/include/SDL_test_harness.h +6 -6
  70. data/dependencies/SDL/include/SDL_test_images.h +1 -1
  71. data/dependencies/SDL/include/SDL_test_log.h +1 -1
  72. data/dependencies/SDL/include/SDL_test_md5.h +1 -1
  73. data/dependencies/SDL/include/SDL_test_memory.h +1 -1
  74. data/dependencies/SDL/include/SDL_test_random.h +2 -2
  75. data/dependencies/SDL/include/SDL_thread.h +226 -128
  76. data/dependencies/SDL/include/SDL_timer.h +129 -22
  77. data/dependencies/SDL/include/SDL_touch.h +48 -8
  78. data/dependencies/SDL/include/SDL_types.h +1 -1
  79. data/dependencies/SDL/include/SDL_version.h +72 -46
  80. data/dependencies/SDL/include/SDL_video.h +1266 -460
  81. data/dependencies/SDL/include/SDL_vulkan.h +100 -161
  82. data/dependencies/SDL/include/begin_code.h +22 -1
  83. data/dependencies/SDL/include/close_code.h +1 -1
  84. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  85. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  86. data/dependencies/SDL_sound/SDL_sound.c +83 -7
  87. data/dependencies/SDL_sound/SDL_sound.h +4 -4
  88. data/dependencies/SDL_sound/SDL_sound_aiff.c +9 -12
  89. data/dependencies/SDL_sound/SDL_sound_au.c +7 -7
  90. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +3 -3
  91. data/dependencies/SDL_sound/SDL_sound_flac.c +1 -1
  92. data/dependencies/SDL_sound/SDL_sound_internal.h +17 -10
  93. data/dependencies/SDL_sound/SDL_sound_modplug.c +25 -27
  94. data/dependencies/SDL_sound/SDL_sound_mp3.c +5 -17
  95. data/dependencies/SDL_sound/SDL_sound_raw.c +11 -11
  96. data/dependencies/SDL_sound/SDL_sound_shn.c +8 -7
  97. data/dependencies/SDL_sound/SDL_sound_voc.c +6 -4
  98. data/dependencies/SDL_sound/SDL_sound_vorbis.c +6 -11
  99. data/dependencies/SDL_sound/SDL_sound_wav.c +35 -29
  100. data/dependencies/SDL_sound/dr_flac.h +618 -220
  101. data/dependencies/SDL_sound/dr_mp3.h +263 -94
  102. data/dependencies/SDL_sound/libmodplug/fastmix.c +58 -64
  103. data/dependencies/SDL_sound/libmodplug/libmodplug.h +25 -103
  104. data/dependencies/SDL_sound/libmodplug/load_669.c +14 -17
  105. data/dependencies/SDL_sound/libmodplug/load_amf.c +11 -7
  106. data/dependencies/SDL_sound/libmodplug/load_ams.c +65 -22
  107. data/dependencies/SDL_sound/libmodplug/load_dbm.c +8 -4
  108. data/dependencies/SDL_sound/libmodplug/load_dmf.c +55 -25
  109. data/dependencies/SDL_sound/libmodplug/load_far.c +9 -13
  110. data/dependencies/SDL_sound/libmodplug/load_gdm.c +448 -0
  111. data/dependencies/SDL_sound/libmodplug/load_it.c +45 -49
  112. data/dependencies/SDL_sound/libmodplug/load_mdl.c +80 -53
  113. data/dependencies/SDL_sound/libmodplug/load_med.c +20 -12
  114. data/dependencies/SDL_sound/libmodplug/load_mod.c +40 -15
  115. data/dependencies/SDL_sound/libmodplug/load_mt2.c +29 -17
  116. data/dependencies/SDL_sound/libmodplug/load_okt.c +12 -8
  117. data/dependencies/SDL_sound/libmodplug/load_psm.c +101 -78
  118. data/dependencies/SDL_sound/libmodplug/load_ptm.c +18 -17
  119. data/dependencies/SDL_sound/libmodplug/load_s3m.c +9 -7
  120. data/dependencies/SDL_sound/libmodplug/load_stm.c +3 -2
  121. data/dependencies/SDL_sound/libmodplug/load_ult.c +2 -2
  122. data/dependencies/SDL_sound/libmodplug/load_umx.c +315 -35
  123. data/dependencies/SDL_sound/libmodplug/load_xm.c +25 -21
  124. data/dependencies/SDL_sound/libmodplug/mmcmp.c +295 -149
  125. data/dependencies/SDL_sound/libmodplug/modplug.c +7 -123
  126. data/dependencies/SDL_sound/libmodplug/modplug.h +32 -29
  127. data/dependencies/SDL_sound/libmodplug/snd_dsp.c +0 -1
  128. data/dependencies/SDL_sound/libmodplug/snd_flt.c +2 -2
  129. data/dependencies/SDL_sound/libmodplug/snd_fx.c +24 -18
  130. data/dependencies/SDL_sound/libmodplug/sndfile.c +55 -156
  131. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -12
  132. data/dependencies/SDL_sound/libmodplug/tables.h +10 -15
  133. data/dependencies/SDL_sound/stb_vorbis.h +508 -325
  134. data/dependencies/{al_soft → mojoAL}/AL/al.h +38 -30
  135. data/dependencies/{al_soft → mojoAL}/AL/alc.h +27 -56
  136. data/dependencies/mojoAL/mojoal.c +4594 -0
  137. data/ext/gosu/extconf.rb +29 -30
  138. data/include/Gosu/Audio.hpp +70 -85
  139. data/include/Gosu/Color.hpp +19 -11
  140. data/include/Gosu/Font.hpp +40 -44
  141. data/include/Gosu/Graphics.hpp +58 -71
  142. data/include/Gosu/GraphicsBase.hpp +26 -33
  143. data/include/Gosu/Image.hpp +56 -62
  144. data/include/Gosu/ImageData.hpp +23 -27
  145. data/include/Gosu/Inspection.hpp +1 -4
  146. data/include/Gosu/TextInput.hpp +34 -40
  147. data/include/Gosu/Version.hpp +1 -1
  148. data/include/Gosu/Window.hpp +71 -70
  149. data/lib/SDL2.dll +0 -0
  150. data/lib/gosu/compat.rb +24 -37
  151. data/lib/gosu.rb +2 -2
  152. data/lib64/SDL2.dll +0 -0
  153. data/src/Audio.cpp +86 -86
  154. data/src/AudioFile.hpp +6 -6
  155. data/src/AudioFileAudioToolbox.cpp +1 -1
  156. data/src/AudioFileSDLSound.cpp +1 -1
  157. data/src/AudioImpl.hpp +5 -5
  158. data/src/BitmapIO.cpp +0 -20
  159. data/src/BlockAllocator.cpp +2 -1
  160. data/src/Channel.cpp +22 -20
  161. data/src/Color.cpp +12 -9
  162. data/src/EmptyImageData.hpp +15 -17
  163. data/src/FileUnix.cpp +1 -1
  164. data/src/FileWin.cpp +1 -1
  165. data/src/Font.cpp +48 -53
  166. data/src/Graphics.cpp +135 -143
  167. data/src/Image.cpp +41 -42
  168. data/src/Input.cpp +1 -1
  169. data/src/InputUIKit.cpp +1 -1
  170. data/src/LargeImageData.cpp +108 -101
  171. data/src/LargeImageData.hpp +17 -15
  172. data/src/Log.hpp +6 -6
  173. data/src/Macro.cpp +35 -37
  174. data/src/Macro.hpp +11 -11
  175. data/src/Math.cpp +8 -1
  176. data/src/Resolution.cpp +12 -7
  177. data/src/RubyGosu.cxx +5 -5
  178. data/src/TexChunk.cpp +50 -41
  179. data/src/TexChunk.hpp +22 -22
  180. data/src/Text.cpp +37 -37
  181. data/src/TextBuilder.cpp +60 -57
  182. data/src/TextBuilder.hpp +20 -20
  183. data/src/TextInput.cpp +127 -135
  184. data/src/TrueTypeFont.cpp +107 -107
  185. data/src/TrueTypeFont.hpp +39 -38
  186. data/src/TrueTypeFontApple.cpp +19 -22
  187. data/src/TrueTypeFontUnix.cpp +21 -26
  188. data/src/TrueTypeFontWin.cpp +30 -30
  189. data/src/Window.cpp +95 -86
  190. data/src/WindowUIKit.cpp +46 -49
  191. metadata +7 -17
  192. data/dependencies/SDL/include/SDL_config_os2.h +0 -188
  193. data/dependencies/SDL_sound/libmodplug/load_abc.c +0 -4725
  194. data/dependencies/SDL_sound/libmodplug/load_mid.c +0 -1405
  195. data/dependencies/SDL_sound/libmodplug/load_pat.c +0 -1143
  196. data/dependencies/SDL_sound/libmodplug/load_pat.h +0 -25
  197. data/dependencies/al_soft/AL/alext.h +0 -585
  198. data/dependencies/al_soft/AL/efx-creative.h +0 -3
  199. data/dependencies/al_soft/AL/efx-presets.h +0 -402
  200. data/dependencies/al_soft/AL/efx.h +0 -762
  201. data/dependencies/al_soft/x64/libOpenAL32.dll.a +0 -0
  202. data/dependencies/al_soft/x86/libOpenAL32.dll.a +0 -0
  203. data/lib/OpenAL32.dll +0 -0
  204. data/lib64/OpenAL32.dll +0 -0
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -33,19 +33,16 @@
33
33
 
34
34
  #define HAVE_GCC_ATOMICS 1
35
35
 
36
- #define STDC_HEADERS 1
37
36
  #define HAVE_ALLOCA_H 1
38
- #define HAVE_CTYPE_H 1
37
+ #define HAVE_SYS_TYPES_H 1
38
+ #define HAVE_STDIO_H 1
39
+ #define STDC_HEADERS 1
40
+ #define HAVE_STRING_H 1
39
41
  #define HAVE_INTTYPES_H 1
40
- #define HAVE_LIMITS_H 1
42
+ #define HAVE_STDINT_H 1
43
+ #define HAVE_CTYPE_H 1
41
44
  #define HAVE_MATH_H 1
42
45
  #define HAVE_SIGNAL_H 1
43
- #define HAVE_STDINT_H 1
44
- #define HAVE_STDIO_H 1
45
- #define HAVE_STRING_H 1
46
- #define HAVE_SYS_TYPES_H 1
47
- /* The libunwind functions are only available on x86 */
48
- /* #undef HAVE_LIBUNWIND_H */
49
46
 
50
47
  /* C library functions */
51
48
  #define HAVE_MALLOC 1
@@ -68,10 +65,10 @@
68
65
  #define HAVE_STRLEN 1
69
66
  #define HAVE_STRLCPY 1
70
67
  #define HAVE_STRLCAT 1
68
+ #define HAVE_STRDUP 1
71
69
  #define HAVE_STRCHR 1
72
70
  #define HAVE_STRRCHR 1
73
71
  #define HAVE_STRSTR 1
74
- #define HAVE_STRTOK_R 1
75
72
  #define HAVE_STRTOL 1
76
73
  #define HAVE_STRTOUL 1
77
74
  #define HAVE_STRTOLL 1
@@ -86,44 +83,25 @@
86
83
  #define HAVE_VSSCANF 1
87
84
  #define HAVE_VSNPRINTF 1
88
85
  #define HAVE_M_PI 1
89
- #define HAVE_ACOS 1
90
- #define HAVE_ACOSF 1
91
- #define HAVE_ASIN 1
92
- #define HAVE_ASINF 1
93
86
  #define HAVE_ATAN 1
94
- #define HAVE_ATANF 1
95
87
  #define HAVE_ATAN2 1
96
- #define HAVE_ATAN2F 1
88
+ #define HAVE_ACOS 1
89
+ #define HAVE_ASIN 1
97
90
  #define HAVE_CEIL 1
98
- #define HAVE_CEILF 1
99
91
  #define HAVE_COPYSIGN 1
100
- #define HAVE_COPYSIGNF 1
101
92
  #define HAVE_COS 1
102
93
  #define HAVE_COSF 1
103
- #define HAVE_EXP 1
104
- #define HAVE_EXPF 1
105
94
  #define HAVE_FABS 1
106
- #define HAVE_FABSF 1
107
95
  #define HAVE_FLOOR 1
108
- #define HAVE_FLOORF 1
109
- #define HAVE_FMOD 1
110
- #define HAVE_FMODF 1
111
96
  #define HAVE_LOG 1
112
- #define HAVE_LOGF 1
113
- #define HAVE_LOG10 1
114
- #define HAVE_LOG10F 1
115
97
  #define HAVE_POW 1
116
- #define HAVE_POWF 1
117
98
  #define HAVE_SCALBN 1
118
- #define HAVE_SCALBNF 1
119
99
  #define HAVE_SIN 1
120
100
  #define HAVE_SINF 1
121
101
  #define HAVE_SQRT 1
122
102
  #define HAVE_SQRTF 1
123
103
  #define HAVE_TAN 1
124
104
  #define HAVE_TANF 1
125
- #define HAVE_TRUNC 1
126
- #define HAVE_TRUNCF 1
127
105
  #define HAVE_SIGACTION 1
128
106
  #define HAVE_SETJMP 1
129
107
  #define HAVE_NANOSLEEP 1
@@ -138,18 +116,8 @@
138
116
  /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
139
117
  #define SDL_HAPTIC_DUMMY 1
140
118
 
141
- /* Enable joystick support */
142
- /* Only enable HIDAPI support if you want to support Steam Controllers on iOS and tvOS */
143
- /*#define SDL_JOYSTICK_HIDAPI 1*/
119
+ /* Enable MFi joystick support */
144
120
  #define SDL_JOYSTICK_MFI 1
145
- #define SDL_JOYSTICK_VIRTUAL 1
146
-
147
- #ifdef __TVOS__
148
- #define SDL_SENSOR_DUMMY 1
149
- #else
150
- /* Enable the CoreMotion sensor driver */
151
- #define SDL_SENSOR_COREMOTION 1
152
- #endif
153
121
 
154
122
  /* Enable Unix style SO loading */
155
123
  #define SDL_LOADSO_DLOPEN 1
@@ -165,31 +133,17 @@
165
133
  #define SDL_VIDEO_DRIVER_UIKIT 1
166
134
  #define SDL_VIDEO_DRIVER_DUMMY 1
167
135
 
168
- /* Enable OpenGL ES */
136
+ /* enable OpenGL ES */
169
137
  #define SDL_VIDEO_OPENGL_ES2 1
170
138
  #define SDL_VIDEO_OPENGL_ES 1
171
139
  #define SDL_VIDEO_RENDER_OGL_ES 1
172
140
  #define SDL_VIDEO_RENDER_OGL_ES2 1
173
141
 
174
- /* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer
175
- Also supported in simulator from iOS 13.0 and tvOS 13.0
176
- */
177
- #if (TARGET_OS_SIMULATOR && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (__TV_OS_VERSION_MIN_REQUIRED >= 130000))) || (!TARGET_CPU_ARM && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 90000)))
178
- #define SDL_PLATFORM_SUPPORTS_METAL 1
179
- #else
180
- #define SDL_PLATFORM_SUPPORTS_METAL 0
181
- #endif
182
-
183
- #if SDL_PLATFORM_SUPPORTS_METAL
184
- #define SDL_VIDEO_RENDER_METAL 1
185
- #endif
186
-
187
- #if SDL_PLATFORM_SUPPORTS_METAL
142
+ /* Enable Vulkan support */
143
+ #if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM // Only 64-bit devices have Metal
188
144
  #define SDL_VIDEO_VULKAN 1
189
- #endif
190
-
191
- #if SDL_PLATFORM_SUPPORTS_METAL
192
- #define SDL_VIDEO_METAL 1
145
+ #else
146
+ #define SDL_VIDEO_VULKAN 0
193
147
  #endif
194
148
 
195
149
  /* Enable system power support */
@@ -201,6 +155,11 @@
201
155
  /* enable iOS extended launch screen */
202
156
  #define SDL_IPHONE_LAUNCHSCREEN 1
203
157
 
158
+ /* Set max recognized G-force from accelerometer
159
+ See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed
160
+ */
161
+ #define SDL_IPHONE_MAX_GFORCE 5.0
162
+
204
163
  /* enable filesystem support */
205
164
  #define SDL_FILESYSTEM_COCOA 1
206
165
 
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -37,19 +37,16 @@
37
37
  #endif
38
38
 
39
39
  /* Useful headers */
40
- #define STDC_HEADERS 1
41
40
  #define HAVE_ALLOCA_H 1
42
- #define HAVE_CTYPE_H 1
43
- #define HAVE_FLOAT_H 1
41
+ #define HAVE_SYS_TYPES_H 1
42
+ #define HAVE_STDIO_H 1
43
+ #define STDC_HEADERS 1
44
+ #define HAVE_STRING_H 1
44
45
  #define HAVE_INTTYPES_H 1
45
- #define HAVE_LIMITS_H 1
46
+ #define HAVE_STDINT_H 1
47
+ #define HAVE_CTYPE_H 1
46
48
  #define HAVE_MATH_H 1
47
49
  #define HAVE_SIGNAL_H 1
48
- #define HAVE_STDINT_H 1
49
- #define HAVE_STDIO_H 1
50
- #define HAVE_STRING_H 1
51
- #define HAVE_SYS_TYPES_H 1
52
- #define HAVE_LIBUNWIND_H 1
53
50
 
54
51
  /* C library functions */
55
52
  #define HAVE_MALLOC 1
@@ -71,10 +68,10 @@
71
68
  #define HAVE_STRLEN 1
72
69
  #define HAVE_STRLCPY 1
73
70
  #define HAVE_STRLCAT 1
71
+ #define HAVE_STRDUP 1
74
72
  #define HAVE_STRCHR 1
75
73
  #define HAVE_STRRCHR 1
76
74
  #define HAVE_STRSTR 1
77
- #define HAVE_STRTOK_R 1
78
75
  #define HAVE_STRTOL 1
79
76
  #define HAVE_STRTOUL 1
80
77
  #define HAVE_STRTOLL 1
@@ -88,52 +85,30 @@
88
85
  #define HAVE_STRNCASECMP 1
89
86
  #define HAVE_VSSCANF 1
90
87
  #define HAVE_VSNPRINTF 1
91
- #define HAVE_M_PI 1
92
- #define HAVE_ACOS 1
93
- #define HAVE_ACOSF 1
94
- #define HAVE_ASIN 1
95
- #define HAVE_ASINF 1
96
- #define HAVE_ATAN 1
97
- #define HAVE_ATANF 1
98
- #define HAVE_ATAN2 1
99
- #define HAVE_ATAN2F 1
100
88
  #define HAVE_CEIL 1
101
- #define HAVE_CEILF 1
102
89
  #define HAVE_COPYSIGN 1
103
- #define HAVE_COPYSIGNF 1
104
90
  #define HAVE_COS 1
105
91
  #define HAVE_COSF 1
106
- #define HAVE_EXP 1
107
- #define HAVE_EXPF 1
108
92
  #define HAVE_FABS 1
109
- #define HAVE_FABSF 1
110
93
  #define HAVE_FLOOR 1
111
- #define HAVE_FLOORF 1
112
- #define HAVE_FMOD 1
113
- #define HAVE_FMODF 1
114
94
  #define HAVE_LOG 1
115
- #define HAVE_LOGF 1
116
- #define HAVE_LOG10 1
117
- #define HAVE_LOG10F 1
118
95
  #define HAVE_POW 1
119
- #define HAVE_POWF 1
120
96
  #define HAVE_SCALBN 1
121
- #define HAVE_SCALBNF 1
122
97
  #define HAVE_SIN 1
123
98
  #define HAVE_SINF 1
124
99
  #define HAVE_SQRT 1
125
100
  #define HAVE_SQRTF 1
126
101
  #define HAVE_TAN 1
127
102
  #define HAVE_TANF 1
128
- #define HAVE_TRUNC 1
129
- #define HAVE_TRUNCF 1
130
103
  #define HAVE_SIGACTION 1
131
104
  #define HAVE_SETJMP 1
132
105
  #define HAVE_NANOSLEEP 1
133
106
  #define HAVE_SYSCONF 1
134
107
  #define HAVE_SYSCTLBYNAME 1
135
-
136
- #define HAVE_GCC_ATOMICS 1
108
+ #define HAVE_ATAN 1
109
+ #define HAVE_ATAN2 1
110
+ #define HAVE_ACOS 1
111
+ #define HAVE_ASIN 1
137
112
 
138
113
  /* Enable various audio drivers */
139
114
  #define SDL_AUDIO_DRIVER_COREAUDIO 1
@@ -141,19 +116,9 @@
141
116
  #define SDL_AUDIO_DRIVER_DUMMY 1
142
117
 
143
118
  /* Enable various input drivers */
144
- #define SDL_JOYSTICK_HIDAPI 1
145
119
  #define SDL_JOYSTICK_IOKIT 1
146
- #define SDL_JOYSTICK_VIRTUAL 1
147
120
  #define SDL_HAPTIC_IOKIT 1
148
121
 
149
- /* The MFI controller support requires ARC Objective C runtime */
150
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)
151
- #define SDL_JOYSTICK_MFI 1
152
- #endif
153
-
154
- /* Enable the dummy sensor driver */
155
- #define SDL_SENSOR_DUMMY 1
156
-
157
122
  /* Enable various shared object loading systems */
158
123
  #define SDL_LOADSO_DLOPEN 1
159
124
 
@@ -168,13 +133,13 @@
168
133
  #define SDL_VIDEO_DRIVER_COCOA 1
169
134
  #define SDL_VIDEO_DRIVER_DUMMY 1
170
135
  #undef SDL_VIDEO_DRIVER_X11
171
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC "/opt/X11/lib/libX11.6.dylib"
172
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/opt/X11/lib/libXext.6.dylib"
173
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/opt/X11/lib/libXinerama.1.dylib"
174
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/opt/X11/lib/libXi.6.dylib"
175
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/opt/X11/lib/libXrandr.2.dylib"
176
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/opt/X11/lib/libXss.1.dylib"
177
- #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/opt/X11/lib/libXxf86vm.1.dylib"
136
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
137
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
138
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
139
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib"
140
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
141
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
142
+ #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
178
143
  #define SDL_VIDEO_DRIVER_X11_XDBE 1
179
144
  #define SDL_VIDEO_DRIVER_X11_XINERAMA 1
180
145
  #define SDL_VIDEO_DRIVER_X11_XRANDR 1
@@ -198,35 +163,10 @@
198
163
  #define SDL_VIDEO_RENDER_OGL 1
199
164
  #endif
200
165
 
201
- #ifndef SDL_VIDEO_RENDER_OGL_ES2
202
- #define SDL_VIDEO_RENDER_OGL_ES2 1
203
- #endif
204
-
205
- /* Metal only supported on 64-bit architectures with 10.11+ */
206
- #if TARGET_RT_64_BIT && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
207
- #define SDL_PLATFORM_SUPPORTS_METAL 1
208
- #else
209
- #define SDL_PLATFORM_SUPPORTS_METAL 0
210
- #endif
211
-
212
- #ifndef SDL_VIDEO_RENDER_METAL
213
- #if SDL_PLATFORM_SUPPORTS_METAL
214
- #define SDL_VIDEO_RENDER_METAL 1
215
- #else
216
- #define SDL_VIDEO_RENDER_METAL 0
217
- #endif
218
- #endif
219
-
220
166
  /* Enable OpenGL support */
221
167
  #ifndef SDL_VIDEO_OPENGL
222
168
  #define SDL_VIDEO_OPENGL 1
223
169
  #endif
224
- #ifndef SDL_VIDEO_OPENGL_ES2
225
- #define SDL_VIDEO_OPENGL_ES2 1
226
- #endif
227
- #ifndef SDL_VIDEO_OPENGL_EGL
228
- #define SDL_VIDEO_OPENGL_EGL 1
229
- #endif
230
170
  #ifndef SDL_VIDEO_OPENGL_CGL
231
171
  #define SDL_VIDEO_OPENGL_CGL 1
232
172
  #endif
@@ -234,21 +174,12 @@
234
174
  #define SDL_VIDEO_OPENGL_GLX 1
235
175
  #endif
236
176
 
237
- /* Enable Vulkan and Metal support */
238
- #ifndef SDL_VIDEO_VULKAN
239
- #if SDL_PLATFORM_SUPPORTS_METAL
177
+ /* Enable Vulkan support */
178
+ /* Metal/MoltenVK/Vulkan only supported on 64-bit architectures with 10.11+ */
179
+ #if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
240
180
  #define SDL_VIDEO_VULKAN 1
241
181
  #else
242
- #define SDL_VIDEO_VULKAN 0
243
- #endif
244
- #endif
245
-
246
- #ifndef SDL_VIDEO_METAL
247
- #if SDL_PLATFORM_SUPPORTS_METAL
248
- #define SDL_VIDEO_METAL 1
249
- #else
250
- #define SDL_VIDEO_METAL 0
251
- #endif
182
+ #define SDL_VIDEO_VULKAN 0
252
183
  #endif
253
184
 
254
185
  /* Enable system power support */
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -64,9 +64,6 @@ typedef unsigned long uintptr_t;
64
64
  /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
65
65
  #define SDL_HAPTIC_DISABLED 1
66
66
 
67
- /* Enable the stub sensor driver (src/sensor/dummy/\*.c) */
68
- #define SDL_SENSOR_DISABLED 1
69
-
70
67
  /* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
71
68
  #define SDL_LOADSO_DISABLED 1
72
69
 
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -36,24 +36,22 @@
36
36
 
37
37
  #define SDL_BYTEORDER 1234
38
38
 
39
- #define STDC_HEADERS 1
40
39
  #define HAVE_ALLOCA_H 1
41
- #define HAVE_CTYPE_H 1
42
- #define HAVE_ICONV_H 1
43
- #define HAVE_INTTYPES_H 1
44
- #define HAVE_LIMITS_H 1
45
- #define HAVE_MALLOC_H 1
46
- #define HAVE_MATH_H 1
47
- #define HAVE_MEMORY_H 1
48
- #define HAVE_SIGNAL_H 1
49
- #define HAVE_STDARG_H 1
50
- #define HAVE_STDINT_H 1
40
+ #define HAVE_SYS_TYPES_H 1
51
41
  #define HAVE_STDIO_H 1
42
+ #define STDC_HEADERS 1
52
43
  #define HAVE_STDLIB_H 1
53
- #define HAVE_STRINGS_H 1
44
+ #define HAVE_STDARG_H 1
45
+ #define HAVE_MALLOC_H 1
46
+ #define HAVE_MEMORY_H 1
54
47
  #define HAVE_STRING_H 1
55
- #define HAVE_SYS_TYPES_H 1
56
-
48
+ #define HAVE_STRINGS_H 1
49
+ #define HAVE_INTTYPES_H 1
50
+ #define HAVE_STDINT_H 1
51
+ #define HAVE_CTYPE_H 1
52
+ #define HAVE_MATH_H 1
53
+ #define HAVE_ICONV_H 1
54
+ #define HAVE_SIGNAL_H 1
57
55
  #define HAVE_MALLOC 1
58
56
  #define HAVE_CALLOC 1
59
57
  #define HAVE_REALLOC 1
@@ -70,6 +68,7 @@
70
68
  #define HAVE_MEMCPY 1
71
69
  #define HAVE_MEMMOVE 1
72
70
  #define HAVE_STRLEN 1
71
+ #define HAVE_STRDUP 1
73
72
  #define HAVE_STRCHR 1
74
73
  #define HAVE_STRRCHR 1
75
74
  #define HAVE_STRSTR 1
@@ -90,11 +89,9 @@
90
89
  #define HAVE_COPYSIGN 1
91
90
  #define HAVE_COS 1
92
91
  #define HAVE_COSF 1
93
- #define HAVE_EXP 1
94
92
  #define HAVE_FABS 1
95
93
  #define HAVE_FLOOR 1
96
94
  #define HAVE_LOG 1
97
- #define HAVE_LOG10 1
98
95
  #define HAVE_SCALBN 1
99
96
  #define HAVE_SIN 1
100
97
  #define HAVE_SINF 1
@@ -102,8 +99,6 @@
102
99
  #define HAVE_SQRTF 1
103
100
  #define HAVE_TAN 1
104
101
  #define HAVE_TANF 1
105
- #define HAVE_TRUNC 1
106
- #define HAVE_TRUNCF 1
107
102
  #define HAVE_SIGACTION 1
108
103
  #define HAVE_SETJMP 1
109
104
  #define HAVE_NANOSLEEP 1
@@ -112,12 +107,10 @@
112
107
  #define SDL_AUDIO_DRIVER_OSS 1
113
108
 
114
109
  #define SDL_INPUT_LINUXEV 1
110
+ #define SDL_INPUT_TSLIB 1
115
111
  #define SDL_JOYSTICK_LINUX 1
116
- #define SDL_JOYSTICK_VIRTUAL 1
117
112
  #define SDL_HAPTIC_LINUX 1
118
113
 
119
- #define SDL_SENSOR_DUMMY 1
120
-
121
114
  #define SDL_LOADSO_DLOPEN 1
122
115
 
123
116
  #define SDL_THREAD_PTHREAD 1
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  Simple DirectMedia Layer
3
- Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
3
+ Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
4
4
 
5
5
  This software is provided 'as-is', without any express or implied
6
6
  warranty. In no event will the authors be held liable for any damages
@@ -33,17 +33,16 @@
33
33
 
34
34
  #define HAVE_GCC_ATOMICS 1
35
35
 
36
- #define STDC_HEADERS 1
37
36
  #define HAVE_ALLOCA_H 1
38
- #define HAVE_CTYPE_H 1
37
+ #define HAVE_SYS_TYPES_H 1
38
+ #define HAVE_STDIO_H 1
39
+ #define STDC_HEADERS 1
40
+ #define HAVE_STRING_H 1
39
41
  #define HAVE_INTTYPES_H 1
40
- #define HAVE_LIMITS_H 1
42
+ #define HAVE_STDINT_H 1
43
+ #define HAVE_CTYPE_H 1
41
44
  #define HAVE_MATH_H 1
42
45
  #define HAVE_SIGNAL_H 1
43
- #define HAVE_STDINT_H 1
44
- #define HAVE_STDIO_H 1
45
- #define HAVE_STRING_H 1
46
- #define HAVE_SYS_TYPES_H 1
47
46
 
48
47
  /* C library functions */
49
48
  #define HAVE_MALLOC 1
@@ -66,6 +65,7 @@
66
65
  #define HAVE_STRLEN 1
67
66
  #define HAVE_STRLCPY 1
68
67
  #define HAVE_STRLCAT 1
68
+ #define HAVE_STRDUP 1
69
69
  #define HAVE_STRCHR 1
70
70
  #define HAVE_STRRCHR 1
71
71
  #define HAVE_STRSTR 1
@@ -83,36 +83,19 @@
83
83
  #define HAVE_VSSCANF 1
84
84
  #define HAVE_VSNPRINTF 1
85
85
  #define HAVE_M_PI 1
86
- #define HAVE_ACOS 1
87
- #define HAVE_ACOSF 1
88
- #define HAVE_ASIN 1
89
- #define HAVE_ASINF 1
90
86
  #define HAVE_ATAN 1
91
- #define HAVE_ATANF 1
92
87
  #define HAVE_ATAN2 1
93
- #define HAVE_ATAN2F 1
88
+ #define HAVE_ACOS 1
89
+ #define HAVE_ASIN 1
94
90
  #define HAVE_CEIL 1
95
- #define HAVE_CEILF 1
96
91
  #define HAVE_COPYSIGN 1
97
- #define HAVE_COPYSIGNF 1
98
92
  #define HAVE_COS 1
99
93
  #define HAVE_COSF 1
100
- #define HAVE_EXP 1
101
- #define HAVE_EXPF 1
102
94
  #define HAVE_FABS 1
103
- #define HAVE_FABSF 1
104
95
  #define HAVE_FLOOR 1
105
- #define HAVE_FLOORF 1
106
- #define HAVE_FMOD 1
107
- #define HAVE_FMODF 1
108
96
  #define HAVE_LOG 1
109
- #define HAVE_LOGF 1
110
- #define HAVE_LOG10 1
111
- #define HAVE_LOG10F 1
112
97
  #define HAVE_POW 1
113
- #define HAVE_POWF 1
114
98
  #define HAVE_SCALBN 1
115
- #define HAVE_SCALBNF 1
116
99
  #define HAVE_SIN 1
117
100
  #define HAVE_SINF 1
118
101
  #define HAVE_SQRT 1
@@ -128,26 +111,22 @@
128
111
  /* PSP isn't that sophisticated */
129
112
  #define LACKS_SYS_MMAN_H 1
130
113
 
131
- /* Enable the PSP thread support (src/thread/psp/\*.c) */
114
+ /* Enable the stub thread support (src/thread/psp/\*.c) */
132
115
  #define SDL_THREAD_PSP 1
133
116
 
134
- /* Enable the PSP timer support (src/timer/psp/\*.c) */
117
+ /* Enable the stub timer support (src/timer/psp/\*.c) */
135
118
  #define SDL_TIMERS_PSP 1
136
119
 
137
- /* Enable the PSP joystick driver (src/joystick/psp/\*.c) */
120
+ /* Enable the stub joystick driver (src/joystick/psp/\*.c) */
138
121
  #define SDL_JOYSTICK_PSP 1
139
- #define SDL_JOYSTICK_VIRTUAL 1
140
-
141
- /* Enable the dummy sensor driver */
142
- #define SDL_SENSOR_DUMMY 1
143
122
 
144
- /* Enable the PSP audio driver (src/audio/psp/\*.c) */
123
+ /* Enable the stub audio driver (src/audio/psp/\*.c) */
145
124
  #define SDL_AUDIO_DRIVER_PSP 1
146
125
 
147
- /* PSP video driver */
126
+ /* PSP video dirver */
148
127
  #define SDL_VIDEO_DRIVER_PSP 1
149
128
 
150
- /* PSP render driver */
129
+ /* PSP render dirver */
151
130
  #define SDL_VIDEO_RENDER_PSP 1
152
131
 
153
132
  #define SDL_POWER_PSP 1