Skip to content

Commit 94eb98e

Browse files
committed
Bump: SDL release v2.0.22
1 parent 9918f1f commit 94eb98e

File tree

1,308 files changed

+94675
-106540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,308 files changed

+94675
-106540
lines changed

Android.mk

+5-22
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \
2020
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
2121
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
2222
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
23+
$(wildcard $(LOCAL_PATH)/src/audio/aaudio/*.c) \
2324
$(wildcard $(LOCAL_PATH)/src/audio/openslES/*.c) \
2425
$(LOCAL_PATH)/src/atomic/SDL_atomic.c.arm \
2526
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
@@ -30,6 +31,8 @@ LOCAL_SRC_FILES := \
3031
$(wildcard $(LOCAL_PATH)/src/file/*.c) \
3132
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
3233
$(wildcard $(LOCAL_PATH)/src/haptic/android/*.c) \
34+
$(wildcard $(LOCAL_PATH)/src/hidapi/*.c) \
35+
$(wildcard $(LOCAL_PATH)/src/hidapi/android/*.cpp) \
3336
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
3437
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
3538
$(wildcard $(LOCAL_PATH)/src/joystick/hidapi/*.c) \
@@ -53,9 +56,8 @@ LOCAL_SRC_FILES := \
5356
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
5457
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
5558
$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
56-
$(wildcard $(LOCAL_PATH)/src/video/yuv2rgb/*.c))
57-
58-
LOCAL_SHARED_LIBRARIES := hidapi
59+
$(wildcard $(LOCAL_PATH)/src/video/yuv2rgb/*.c) \
60+
$(wildcard $(LOCAL_PATH)/src/test/*.c))
5961

6062
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
6163
LOCAL_CFLAGS += \
@@ -76,7 +78,6 @@ LOCAL_CFLAGS += \
7678

7779
# Warnings we haven't fixed (yet)
7880
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-sign-compare
79-
8081

8182
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
8283

@@ -119,22 +120,4 @@ LOCAL_MODULE_FILENAME := libSDL2main
119120

120121
include $(BUILD_STATIC_LIBRARY)
121122

122-
###########################
123-
#
124-
# hidapi library
125-
#
126-
###########################
127-
128-
include $(CLEAR_VARS)
129-
130-
LOCAL_CPPFLAGS += -std=c++11
131-
132-
LOCAL_SRC_FILES := src/hidapi/android/hid.cpp
133-
134-
LOCAL_MODULE := libhidapi
135-
LOCAL_LDLIBS := -llog
136-
137-
include $(BUILD_SHARED_LIBRARY)
138-
139123
$(call import-module,android/cpufeatures)
140-

BUGS.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
Bugs are now managed in the SDL bug tracker, here:
2+
Bugs are now managed in the SDL issue tracker, here:
33

4-
https://bugzilla.libsdl.org/
4+
https://github.com/libsdl-org/SDL/issues
55

66
You may report bugs there, and search to see if a given issue has already
77
been reported, discussed, and maybe even fixed.
@@ -11,6 +11,6 @@ You may also find help at the SDL forums/mailing list:
1111

1212
https://discourse.libsdl.org/
1313

14-
Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
15-
bugs discussed on the mailing list may be forgotten or missed.
14+
Bug reports are welcome here, but we really appreciate if you use the issue
15+
tracker, as bugs discussed on the mailing list may be forgotten or missed.
1616

0 commit comments

Comments
 (0)