-
Notifications
You must be signed in to change notification settings - Fork 231
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rebuilt SDL2 from latest 2.0.14 release.
Windows dlls are the same as libsdl.org releases. OSX framework is cross-compiled in-house on a Linux setup for x86 and x86_64. # Conflicts: # MacOSX/SDL2.framework/Versions/A/Headers/SDL.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_os2.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_metal.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_sensor.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h # MacOSX/SDL2.framework/Versions/A/Headers/SDL_vulkan.h # MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h # MacOSX/SDL2.framework/Versions/A/Headers/close_code.h # MacOSX/SDL2.framework/Versions/A/Resources/Info.plist # MacOSX/SDL2.framework/Versions/A/SDL2 # Windows/SDL2/WhatsNew.txt # Windows/SDL2/bin/sdl2-config # Windows/SDL2/lib/SDL2.lib # Windows/SDL2/lib64/SDL2.lib # Windows/SDL2/watcom/SDL2.def # Windows/SDL2/watcom/SDL2.exp # Windows/SDL2/watcom/SDL2.lib
- Loading branch information
Showing
83 changed files
with
1,350 additions
and
235 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
|
||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
|
||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -59,6 +59,8 @@ | |
#include "SDL_timer.h" | ||
#include "SDL_version.h" | ||
#include "SDL_video.h" | ||
#include "SDL_locale.h" | ||
#include "SDL_misc.h" | ||
|
||
#include "begin_code.h" | ||
/* Set up for C function definitions, even when using C++ */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -53,6 +53,8 @@ assert can have unique static variables associated with it. | |
#define SDL_TriggerBreakpoint() __debugbreak() | ||
#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) ) | ||
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) | ||
#elif ( defined(__APPLE__) && defined(__arm64__) ) /* this might work on other ARM targets, but this is a known quantity... */ | ||
#define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" ) | ||
#elif defined(__386__) && defined(__WATCOMC__) | ||
#define SDL_TriggerBreakpoint() { _asm { int 0x03 } } | ||
#elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -50,6 +50,9 @@ typedef enum | |
SDL_BLENDMODE_MOD = 0x00000004, /**< color modulate | ||
dstRGB = srcRGB * dstRGB | ||
dstA = dstA */ | ||
SDL_BLENDMODE_MUL = 0x00000008, /**< color multiply | ||
dstRGB = (srcRGB * dstRGB) + (dstRGB * (1-srcA)) | ||
dstA = (srcA * dstA) + (dstA * (1-srcA)) */ | ||
SDL_BLENDMODE_INVALID = 0x7FFFFFFF | ||
|
||
/* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -121,6 +121,8 @@ | |
#define HAVE_SQRTF 1 | ||
#define HAVE_TAN 1 | ||
#define HAVE_TANF 1 | ||
#define HAVE_TRUNC 1 | ||
#define HAVE_TRUNCF 1 | ||
#define HAVE_SIGACTION 1 | ||
#define HAVE_SETJMP 1 | ||
#define HAVE_NANOSLEEP 1 | ||
|
@@ -136,8 +138,9 @@ | |
|
||
/* Enable various input drivers */ | ||
#define SDL_JOYSTICK_ANDROID 1 | ||
#define SDL_JOYSTICK_HIDAPI 1 | ||
#define SDL_HAPTIC_ANDROID 1 | ||
#define SDL_JOYSTICK_HIDAPI 1 | ||
#define SDL_JOYSTICK_VIRTUAL 1 | ||
#define SDL_HAPTIC_ANDROID 1 | ||
|
||
/* Enable sensor driver */ | ||
#define SDL_SENSOR_ANDROID 1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -122,6 +122,8 @@ | |
#define HAVE_SQRTF 1 | ||
#define HAVE_TAN 1 | ||
#define HAVE_TANF 1 | ||
#define HAVE_TRUNC 1 | ||
#define HAVE_TRUNCF 1 | ||
#define HAVE_SIGACTION 1 | ||
#define HAVE_SETJMP 1 | ||
#define HAVE_NANOSLEEP 1 | ||
|
@@ -136,9 +138,11 @@ | |
/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ | ||
#define SDL_HAPTIC_DUMMY 1 | ||
|
||
/* Enable MFi joystick support */ | ||
#define SDL_JOYSTICK_MFI 1 | ||
/* Enable joystick support */ | ||
/* Only enable HIDAPI support if you want to support Steam Controllers on iOS and tvOS */ | ||
/*#define SDL_JOYSTICK_HIDAPI 1*/ | ||
#define SDL_JOYSTICK_MFI 1 | ||
#define SDL_JOYSTICK_VIRTUAL 1 | ||
|
||
#ifdef __TVOS__ | ||
#define SDL_SENSOR_DUMMY 1 | ||
|
@@ -167,8 +171,10 @@ | |
#define SDL_VIDEO_RENDER_OGL_ES 1 | ||
#define SDL_VIDEO_RENDER_OGL_ES2 1 | ||
|
||
/* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer */ | ||
#if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM && ((__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 90000)) | ||
/* Metal supported on 64-bit devices running iOS 8.0 and tvOS 9.0 and newer | ||
Also supported in simulator from iOS 13.0 and tvOS 13.0 | ||
*/ | ||
#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))) | ||
#define SDL_PLATFORM_SUPPORTS_METAL 1 | ||
#else | ||
#define SDL_PLATFORM_SUPPORTS_METAL 0 | ||
|
@@ -195,11 +201,6 @@ | |
/* enable iOS extended launch screen */ | ||
#define SDL_IPHONE_LAUNCHSCREEN 1 | ||
|
||
/* Set max recognized G-force from accelerometer | ||
See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed | ||
*/ | ||
#define SDL_IPHONE_MAX_GFORCE 5.0 | ||
|
||
/* enable filesystem support */ | ||
#define SDL_FILESYSTEM_COCOA 1 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
@@ -125,6 +125,8 @@ | |
#define HAVE_SQRTF 1 | ||
#define HAVE_TAN 1 | ||
#define HAVE_TANF 1 | ||
#define HAVE_TRUNC 1 | ||
#define HAVE_TRUNCF 1 | ||
#define HAVE_SIGACTION 1 | ||
#define HAVE_SETJMP 1 | ||
#define HAVE_NANOSLEEP 1 | ||
|
@@ -139,10 +141,16 @@ | |
#define SDL_AUDIO_DRIVER_DUMMY 1 | ||
|
||
/* Enable various input drivers */ | ||
#define SDL_JOYSTICK_HIDAPI 1 | ||
#define SDL_JOYSTICK_IOKIT 1 | ||
#define SDL_JOYSTICK_HIDAPI 1 | ||
#define SDL_JOYSTICK_VIRTUAL 1 | ||
#define SDL_HAPTIC_IOKIT 1 | ||
|
||
/* The MFI controller support requires ARC Objective C runtime */ | ||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__) | ||
#define SDL_JOYSTICK_MFI 1 | ||
#endif | ||
|
||
/* Enable the dummy sensor driver */ | ||
#define SDL_SENSOR_DUMMY 1 | ||
|
||
|
@@ -195,7 +203,7 @@ | |
#endif | ||
|
||
/* Metal only supported on 64-bit architectures with 10.11+ */ | ||
#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) | ||
#if TARGET_RT_64_BIT && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100) | ||
#define SDL_PLATFORM_SUPPORTS_METAL 1 | ||
#else | ||
#define SDL_PLATFORM_SUPPORTS_METAL 0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Simple DirectMedia Layer | ||
Copyright (C) 1997-2019 Sam Lantinga <[email protected]> | ||
Copyright (C) 1997-2020 Sam Lantinga <[email protected]> | ||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
|
Oops, something went wrong.