mirror of
https://github.com/love2d/love-android.git
synced 2026-08-21 05:00:22 +02:00
Updated SDL2 to changeset 69a5f3a540af (dev version of 2.0.4)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
@@ -293,6 +293,7 @@ SDL_project "SDL2"
|
||||
["SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS"] = '"libXss.so"',
|
||||
["SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE"] = '"libXxf86vm.so"',
|
||||
["SDL_VIDEO_DRIVER_X11_XCURSOR"] = 1,
|
||||
["SDL_VIDEO_DRIVER_X11_XDBE"] = 1,
|
||||
["SDL_VIDEO_DRIVER_X11_XINERAMA"] = 1,
|
||||
["SDL_VIDEO_DRIVER_X11_XINPUT2"] = 1,
|
||||
["SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH"] = 1,
|
||||
@@ -366,7 +367,7 @@ SDL_project "SDL2"
|
||||
SDL_config
|
||||
{
|
||||
["SDL_AUDIO_DRIVER_COREAUDIO"] = 1,
|
||||
["SDL_JOYSTICK_DISABLED"] = 0,
|
||||
["SDL_JOYSTICK_MFI"] = 1,
|
||||
["SDL_HAPTIC_DISABLED"] = 1,
|
||||
["SDL_LOADSO_DISABLED"] = 1,
|
||||
["SDL_THREAD_PTHREAD"] = 1,
|
||||
@@ -403,5 +404,6 @@ SDL_project "SDL2"
|
||||
"$(SDKROOT)/UIKit.framework",
|
||||
"$(SDKROOT)/Foundation.framework",
|
||||
"$(SDKROOT)/CoreAudio.framework",
|
||||
"$(SDKROOT)/CoreMotion.framework"
|
||||
"$(SDKROOT)/CoreMotion.framework",
|
||||
"$(SDKROOT)/GameController.framework"
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
-- Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
|
||||
-- Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
|
||||
--
|
||||
-- This software is provided 'as-is', without any express or implied
|
||||
-- warranty. In no event will the authors be held liable for any damages
|
||||
|
||||
Reference in New Issue
Block a user