Sam Lantinga
2170301c0b
Merge commit '3b191580c392b7a2f7ee7c8a586020817dc7dc05' into main
2022-06-29 17:25:24 -07:00
Sam Lantinga
21196f4237
Merge commit '314bb5a1ed1a90276597b9aefef225a7c5027845' into main
2022-06-29 17:25:22 -07:00
Sam Lantinga
b733e38c3a
Merge commit '7fd46ec581d45ec3fea3fcfe226bbc2ae824fc7c' into main
2022-06-29 17:25:20 -07:00
Sam Lantinga
3d10cc152e
Merge commit '84d69da4e173365ddfdfe0a77ac5bc79b25f1972' into main
2022-06-29 17:25:18 -07:00
Sam Lantinga
a4c1cf732e
Merge commit '1f3ae75228e46d440e98bc13bbb8ffcfafcee920' into main
2022-06-29 17:25:16 -07:00
Sam Lantinga
cc3563c76c
Merge commit 'b2f07d94d2627b57226543981c5210a3f7642f4e' into main
2022-06-29 17:25:14 -07:00
Sam Lantinga
ebb191f34d
Merge commit 'ebe4f47f2b2e97deed78faa6c3e90ff51cd499a4' into main
2022-06-29 17:25:12 -07:00
Sam Lantinga
e9908d840b
Merge commit '51c6488f97f98aa3d216092c01d9601008be0fbf' into main
2022-06-29 17:25:10 -07:00
Sam Lantinga
af53db1105
Merge commit 'fa39f73552dc9dfd6a6a45aa499ac213f1907ef0' into main
2022-06-29 17:25:08 -07:00
Sam Lantinga
dab3ba1fca
Merge commit '787dc260a8a788a0d2319fe76f7756e0bc607e03' into main
2022-06-29 17:25:06 -07:00
Sam Lantinga
892518f8f7
Merge commit '76f40e2b3b685b18a7f8db64bf425d3c87ddc896' into main
2022-06-29 17:25:04 -07:00
Sam Lantinga
b85118f565
Merge commit 'ca30936314e1867c143475ea278988f82af95155' into main
2022-06-29 17:25:03 -07:00
Sam Lantinga
43f55e6f0a
Merge commit '118a2189fb203dedc274848833b5431273cb1db5' into main
2022-06-29 17:25:01 -07:00
Sam Lantinga
02cbf8b702
Merge commit 'bd49696133eded6f441b20391b5bb4376b3834d8' into main
2022-06-29 17:24:59 -07:00
Sam Lantinga
808edbcdca
Merge commit '6dcb2868b03b21a4cfacf0d5804ee07cfde0a0c7' into main
2022-06-29 17:24:57 -07:00
Sam Lantinga
88816d65d5
Merge commit '78a37516593dbcedb2b0d1a5177f37c348dbb528' into main
2022-06-29 17:24:55 -07:00
Sam Lantinga
233e88f707
Merge commit 'c61367c2731dca1e7ea0e881f69d96317c0aaaab' into main
2022-06-29 17:24:53 -07:00
Sam Lantinga
048da613a5
Merge commit '965c16453785279d921b584c92f14bd0ef034730' into main
2022-06-29 17:24:51 -07:00
Sam Lantinga
4ff3d844ad
Merge commit '3617691fe0cb3b29ffcdeb5567d85126de91ba15' into main
2022-06-29 17:24:49 -07:00
Sam Lantinga
c01ad8e24a
Merge commit 'b3159714dbb1afe1de9a32e86f9ed8e40ae543af' into main
2022-06-29 17:24:48 -07:00
Sam Lantinga
7d0ce0f719
Merge commit 'de409d2a816745b3eb02e780bc7af070a2cc8449' into main
2022-06-29 17:24:46 -07:00
Sam Lantinga
3276436760
Merge commit '2f321fb73c6408b368a20bb08bd08e6265e6ce38' into main
2022-06-29 17:24:44 -07:00
Sam Lantinga
ec1ad6b2ef
Merge commit '3b0c86a36fd97d4fddc8d025d0473a7a6c6de3ca' into main
2022-06-29 17:24:42 -07:00
Sam Lantinga
6b11992678
Merge commit '5f4e9fb9b3b53897cb9ed43791e2180a942b3377' into main
2022-06-29 17:24:40 -07:00
Sam Lantinga
3420751c4f
Merge commit '485b1037b061edb4e9768b6f3b08c35454a621ce' into main
2022-06-29 17:24:38 -07:00
Sam Lantinga
fe00c19455
Merge commit '3e1021239a29b377fec7af9b45cd49b5d42531ca' into main
2022-06-29 17:24:36 -07:00
Sam Lantinga
f716a9a271
Merge commit '4ad4fe67c7f832ec6e8e8a5c04b030691753f39a' into main
2022-06-29 17:24:34 -07:00
chalonverse
3b191580c3
Windows GDK Support ( #5830 )
...
* Added GDK
* Simplfied checks in SDL_config_wingdk.h
* Added testgdk sample
* Added GDK readme
* Fixed error in merge of SDL_windows.h
* Additional GDK fixes
* OpenWatcom should not export _SDL_GDKGetTaskQueue
* Formatting fixes
* Moved initialization code into SDL_GDKRunApp
2022-06-27 10:19:39 -07:00
Sylvain
314bb5a1ed
Fixed bug #5850 : Android EGL_BAD_ACCESS because of viewport command while turning the screen off/on.
2022-06-27 14:45:14 +02:00
Francisco Javier Trujillo Mata
7fd46ec581
Initial PS2_Joystick implementation
2022-06-27 00:32:43 -07:00
Francisco Javier Trujillo Mata
84d69da4e1
Initial SDL_ps2_main implementation
2022-06-27 00:32:43 -07:00
Francisco Javier Trujillo Mata
1f3ae75228
Add ps2_drivers dependency
...
Fix CI
2022-06-27 00:32:43 -07:00
Ivan Epifanov
b2f07d94d2
Vita: create rendertarget color surface with same format as texture. Fixes #5844
2022-06-26 15:41:14 -07:00
unknown
ebe4f47f2b
Fixed __VA_ARGS__ in gcc when no args
2022-06-26 15:35:18 -07:00
unknown
51c6488f97
Add support for SDL_render_d3d12.c to compile in C++ mode
2022-06-26 15:35:18 -07:00
Anonymous Maarten
fa39f73552
cmake: add generated files to a custom target ( #5851 )
...
This way, headers are only generated once .
2022-06-26 23:34:30 +02:00
Ozkan Sezer
787dc260a8
autotools: properly enable the version static assertions
...
SDL doesn't use automake, therefore instead of AC_DEFINE_UNQUOTED
manually add the defines to EXTRA_CFLAGS.
2022-06-24 20:37:20 +03:00
Anonymous Maarten
76f40e2b3b
cmake: remove stray debug line
2022-06-24 19:12:39 +02:00
Anonymous Maarten
ca30936314
cmake: check and use clock_gettime by default on android
2022-06-24 19:12:15 +02:00
Ryan C. Gordon
118a2189fb
build-scripts/wikiheaders.pl: ignore the 'FrontPage' wiki pages.
2022-06-23 16:07:35 -04:00
hsdk123
bd49696133
cmake: use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR ( #5834 )
...
* Update install directory to match generated
https://github.com/libsdl-org/SDL/blob/main/CMakeLists.txt#L3122
Sets `SDL2Config.cmake` to `CMAKE_BINARY_DIR`, whereas the install file tries to find it from a different location.
* cmake: use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR
* ci: test SDL included as a cmake subproject
Co-authored-by: Anonymous Maarten <anonymous.maarten@gmail.com>
2022-06-23 14:18:44 +02:00
Anonymous Maarten
6dcb2868b0
cmake: avoid use of possible non-available XEXT_LIB
2022-06-23 14:17:38 +02:00
Anonymous Maarten
78a3751659
cmake+ci: fix+test sdl2-config + sdl2.pc for all supported platforms
2022-06-23 14:17:38 +02:00
Anonymous Maarten
c61367c273
cmake: do list(APPEND SDLMAIN_SOURCES)
2022-06-23 14:17:38 +02:00
Anonymous Maarten
965c164537
cmake: let cmake test script make use of the installed cmake scripts
2022-06-23 14:17:38 +02:00
Anonymous Maarten
3617691fe0
cmake: install Android.mk files for ndk-build
...
This allows including SDL2 with ndk-build using
NDK_MODULE_PATH + import-module
An install tree looks like:
```
`-- share
|-- aclocal
| `-- sdl2.m4
|-- licenses
| `-- SDL2
| `-- LICENSE.txt
`-- ndk-modules
|-- SDL2
| `-- Android.mk
|-- SDL2-static
| `-- Android.mk
|-- SDL2main
| `-- Android.mk
`-- SDL2test
`-- Android.mk
```
The generated `/share/ndk-modules/SDL2/Android.mk` contains:
```
LOCAL_PATH := $(call my-dir)
_IMPORT_PREFIX := $(LOCAL_PATH)/../../..
include $(CLEAR_VARS)
LOCAL_MODULE := SDL2
LOCAL_SRC_FILES := $(_IMPORT_PREFIX)/lib/libSDL2.so
LOCAL_CPP_FEATURES := rtti exceptions
LOCAL_EXPORT_C_INCLUDES := ${_IMPORT_PREFIX}/include\
${_IMPORT_PREFIX}/include/SDL2
include $(PREBUILT_SHARED_LIBRARY)`
```
2022-06-23 14:17:38 +02:00
Anonymous Maarten
b3159714db
cmake: set HAVE_STATIC_PIC for correct summary
2022-06-23 14:17:38 +02:00
Anonymous Maarten
de409d2a81
cmake: remove spurious UNIX_SYS in dep_option
2022-06-23 14:17:38 +02:00
Anonymous Maarten
2f321fb73c
cmake: disable UNIX_SYS by default for Android
...
This force disables SDL_OSS, SDL_ALSA, SDL_JACK, SDL_ESD,
SDL_PIPEWIRE, SDL_ARTS, SDL_NAS, SDL_SNDIO, SDL_LIBSAMPLERATE,
SDL_RPATH, SDL_CLOCK_GETTIME and SDL_X11.
2022-06-23 14:17:38 +02:00
Wouter Wijsman
3b0c86a36f
Merge pull request #5835 from fjtrujy/psp/improveJoystickDriver
...
[PSP] Improve Joystick driver
2022-06-23 01:14:56 +02:00