Skip to content

Commit

Permalink
Merge commit '2cf3078601d9a4c8f1e0bf57c70b2f7b8984283c'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Sep 25, 2016
2 parents e582d44 + 2cf3078 commit 51bf8b2
Show file tree
Hide file tree
Showing 2,009 changed files with 266,684 additions and 349,163 deletions.
95 changes: 65 additions & 30 deletions .hgignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,94 @@ autom4te*
config.cache
config.log
config.status
configure
libtool
Makefile
sdl-config
SDL.spec
SDL.qpg
SDL2.spec
build
build-deps

# for Xcode
*.orig
*.swp
*.tmp
*.rej
*~
*.o
*.mode1*
*.model*
*.perspective*
*.perspective*
*.pbxuser
(^|/)build($|/)
.DS_Store
Xcode/SDL/SDL.xcodeproj/xcuserdata
Xcode/SDL/SDL.xcodeproj/project.xcworkspace
Xcode/SDLTest/SDLTest.xcodeproj/xcuserdata
Xcode/SDLTest/SDLTest.xcodeproj/project.xcworkspace
Xcode-iOS/SDL/SDL.xcodeproj/xcuserdata
Xcode-iOS/SDL/SDL.xcodeproj/project.xcworkspace
Xcode-iOS/Demos/Demos.xcodeproj/xcuserdata
Xcode-iOS/Demos/Demos.xcodeproj/project.xcworkspace

# for Visual C++
Debug
Release
*.user
*.ncb
*.suo
*.sdf

# for Android
android-project/local.properties

sdl.pc
include/SDL_config.h
test/aclocal.m4
test/autom4te*
test/config.cache
test/config.log
test/config.status
test/configure
test/Makefile
test/SDL.dll
test/stdout.txt
test/stderr.txt
test/SDL2.dll
test/checkkeys
test/graywin
test/loopwave
test/testpower
test/testalpha
test/testbitmap
test/testblitspeed
test/testcdrom
test/testdyngl
test/testatomic
test/testaudioinfo
test/testautomation
test/testdraw2
test/testerror
test/testfile
test/testgamma
test/testgl
test/testhread
test/testgamecontroller
test/testgesture
test/testgl2
test/testgles
test/testhaptic
test/testiconv
test/testime
test/testintersections
test/testjoystick
test/testkeys
test/testloadso
test/testlock
test/testoverlay
test/testmessage
test/testmultiaudio
test/testnative
test/testoverlay2
test/testpalette
test/testplatform
test/testpower
test/testrelative
test/testrendercopyex
test/testrendertarget
test/testresample
test/testrumble
test/testscale
test/testsem
test/testsprite
test/testshader
test/testshape
test/testsprite2
test/testspriteminimal
test/teststreaming
test/testthread
test/testtimer
test/testver
test/testvidinfo
test/testwin
test/testwm
test/threadwin
test/testwm2
test/torturethread
test/testcursor
test/testloadso
test/*.exe
test/*.dSYM
16 changes: 16 additions & 0 deletions .hgtags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
0afe0e38e02cf2048e93582f01c52fbb91d3c7bb release-1.2.7
230b156829ed13b31134d96f689c917981f57b84 release-1.2.5
27cab50ec9c746e886ce0f3fdaa0b0cdc55a594f release-1.2.11
2fe3fbd2bff50165b3cad33bf40d70b3bb3c9fd0 release-1.2.3
3c052d3bcc76c899dfd4846be76243a78e8c7180 release-1.2.4
3c5eed71a3320962551af3b3dfbee0c99fcf0086 release-1.2.10
4867f7f7dd3426d1dbbeef48b3f3b3aa19590cc4 release-1.2.12
6e28dae59e3baf4447c83e833a8d2ac912536f5b release-1.2.1
7c2589fb8d4df54c6faabd3faebd0c0e73f67879 release-1.2.13
86de11faf082881ad9b73a1a1d78733ca07f8db8 release-1.2.6
bb051fa871aa0b53ea57df56a446cec3bb85924c release-1.2.2
cfcb2e1c36ebe9809577adf768b0ec53e8768af9 release-1.2.8
e044e7c70a50a2f54d14ee20d0933e904e5853b6 release-1.2.9
f14cf9d71233934811774f941d0de121d5f96ccf release-1.2.14
39c22a953456f6c9e2c8993c8ff973824104102a pre-touch-removal
ccf5fbfa2afabab429ad911308f362201a94d810 macosx_10_4_supported
49 changes: 49 additions & 0 deletions Android.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
LOCAL_PATH := $(call my-dir)

###########################
#
# SDL shared library
#
###########################

include $(CLEAR_VARS)

LOCAL_MODULE := SDL2

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

LOCAL_SRC_FILES := \
$(subst $(LOCAL_PATH)/,, \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
$(wildcard $(LOCAL_PATH)/src/events/*.c) \
$(wildcard $(LOCAL_PATH)/src/file/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/android/*.c))

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog

include $(BUILD_SHARED_LIBRARY)
18 changes: 0 additions & 18 deletions BUGS
View file

This file was deleted.

16 changes: 16 additions & 0 deletions BUGS.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

Bugs are now managed in the SDL bug tracker, here:

http://bugzilla.libsdl.org/

You may report bugs there, and search to see if a given issue has already
been reported, discussed, and maybe even fixed.


You may also find help on the SDL mailing list. Subscription information:

http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org

Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
bugs discussed on the mailing list may be forgotten or missed.

139 changes: 0 additions & 139 deletions Borland.html
View file

This file was deleted.

Binary file removed Borland.zip
View file
Binary file not shown.
Loading

0 comments on commit 51bf8b2

Please sign in to comment.