LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-17 11:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

... actually update.

Browse Source
This commit is contained in:
Alex Szpakowski
2016-10-29 00:29:20 -03:00
parent 25d889fa38
commit 06ff0e775e
340 changed files with 10970 additions and 5082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SDL2/premake/README-ios.txt
+1
View File
@@ -27,6 +27,7 @@ Xcode-iOS project. Those are:
-CoreAudio.framework
-CoreMotion.framework
-GameController.framework
-AVFoundation.framework
All of these frameworks are part of the iOS SDK, not part of the core OS X
system.
libs/SDL2/premake/VisualC/VS2008/SDL2/SDL2.vcproj
-4
View File
@@ -418,10 +418,6 @@
RelativePath="..\..\..\..\src\audio\SDL_audiodev_c.h"
>
</File>
<File
RelativePath="..\..\..\..\src\audio\SDL_audiomem.h"
>
</File>
<File
RelativePath="..\..\..\..\src\audio\SDL_audiotypecvt.c"
>
libs/SDL2/premake/VisualC/VS2010/SDL2/SDL2.vcxproj
-1
View File
@@ -113,7 +113,6 @@
<ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
<ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
libs/SDL2/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters
-3
View File
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
<Filter>src\audio</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
<Filter>src\audio</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
<Filter>src\audio</Filter>
</ClInclude>
libs/SDL2/premake/VisualC/VS2012/SDL2/SDL2.vcxproj
-1
View File
@@ -115,7 +115,6 @@
<ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
<ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
libs/SDL2/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters
-3
View File
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
<Filter>src\audio</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
<Filter>src\audio</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
<Filter>src\audio</Filter>
</ClInclude>
libs/SDL2/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj
-2
View File
@@ -127,7 +127,6 @@
4DBB70D75469728B342373E8 /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
48886D482B5239D2429E422D /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
227E138737440F101016545F /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
5C3C744F22823D470BED10D6 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
77537CFB490A3599736F3830 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
591062475F93492D625F7D3B /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -369,7 +368,6 @@
4DBB70D75469728B342373E8 /* SDL_audiocvt.c */,
48886D482B5239D2429E422D /* SDL_audiodev.c */,
227E138737440F101016545F /* SDL_audiodev_c.h */,
5C3C744F22823D470BED10D6 /* SDL_audiomem.h */,
0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */,
77537CFB490A3599736F3830 /* SDL_mixer.c */,
591062475F93492D625F7D3B /* SDL_sysaudio.h */,
libs/SDL2/premake/Xcode-iOS/SDL_config_premake.h
+2 -2
View File
@@ -150,8 +150,8 @@
#ifndef SDL_VIDEO_RENDER_OGL_ES2
#define SDL_VIDEO_RENDER_OGL_ES2 1
#endif
#ifndef SDL_LOADSO_DISABLED
#define SDL_LOADSO_DISABLED 1
#ifndef SDL_LOADSO_DLOPEN
#define SDL_LOADSO_DLOPEN 1
#endif
#ifndef SDL_HAPTIC_DISABLED
#define SDL_HAPTIC_DISABLED 1
libs/SDL2/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj
-2
View File
@@ -146,7 +146,6 @@
2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
5D2936CF698D392735D76E9E /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
1F255A29771744AC1DFE48A0 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
14AA3D784A5D4B873D657338 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
748562A8151756FF3FE91679 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -425,7 +424,6 @@
2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */,
5D2936CF698D392735D76E9E /* SDL_audiodev.c */,
1F255A29771744AC1DFE48A0 /* SDL_audiodev_c.h */,
14AA3D784A5D4B873D657338 /* SDL_audiomem.h */,
76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */,
748562A8151756FF3FE91679 /* SDL_mixer.c */,
7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */,
libs/SDL2/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj
-2
View File
@@ -146,7 +146,6 @@
07B907294E82663A7E91738C /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
5AAD4B726237251050431873 /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
15895798549516351860492E /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -425,7 +424,6 @@
07B907294E82663A7E91738C /* SDL_audiocvt.c */,
5AAD4B726237251050431873 /* SDL_audiodev.c */,
15895798549516351860492E /* SDL_audiodev_c.h */,
0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */,
5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */,
2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */,
09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */,
libs/SDL2/premake/premake4.lua
+1 -1
View File
@@ -121,7 +121,7 @@ if _OPTIONS["help"] == nil then
end
local genFile = baseLoc .. "/SDL-gen.lua"
local file = fileopen(genFile, "wt")
local file = fileopen(genFile, "w")
print("Generating " .. genFile .. "...")
-- begin generating the config header file
startGeneration(premakeConfigHeader, premakeTemplateHeader)
libs/SDL2/premake/projects/SDL2.lua
+3 -2
View File
@@ -369,7 +369,7 @@ SDL_project "SDL2"
["SDL_AUDIO_DRIVER_COREAUDIO"] = 1,
["SDL_JOYSTICK_MFI"] = 1,
["SDL_HAPTIC_DISABLED"] = 1,
["SDL_LOADSO_DISABLED"] = 1,
["SDL_LOADSO_DLOPEN"] = 1,
["SDL_THREAD_PTHREAD"] = 1,
["SDL_THREAD_PTHREAD_RECURSIVE_MUTEX"] = 1,
["SDL_TIMER_UNIX"] = 1,
@@ -405,5 +405,6 @@ SDL_project "SDL2"
"$(SDKROOT)/Foundation.framework",
"$(SDKROOT)/CoreAudio.framework",
"$(SDKROOT)/CoreMotion.framework",
"$(SDKROOT)/GameController.framework"
"$(SDKROOT)/GameController.framework",
"$(SDKROOT)/AVFoundation.framework",
}
libs/SDL2/premake/util/sdl_check_compile.lua
+17 -5
View File
@@ -101,6 +101,18 @@ local function cleanup_build()
os.remove("./premakecheck.stdout")
end
local function os_execute(cmd)
if _ENV then
-- Lua 5.2 or greater
local cmdSuccess, textStatus, returnCode = os.execute(cmd)
return returnCode
else
-- Lua 5.1 or lesser
local returnCode = os.execute(cmd)
return returnCode
end
end
-- Check if a source builds, links, and or/runs, where running depends on
-- linking and linking depends on building. The return from this function is
-- a triple, where the first is a boolean value indicating if it successfully
@@ -108,10 +120,10 @@ end
-- linked, and the third represents nil if it was not run or run correctly, or
-- the output from the program executed (may be empty for no output).
local function check_build_source(source, link, run)
local file = fileopen("./premakecheck.c", "wt")
local file = fileopen("./premakecheck.c", "w")
file:write(source)
file:close()
local result = os.execute(build_compile_line())
local result = os_execute(build_compile_line())
if not link then
cleanup_build()
if result == 0 then
@@ -125,13 +137,13 @@ local function check_build_source(source, link, run)
cleanup_build()
return false, false, nil -- no compile, no link, no run
end
result = os.execute(build_link_line())
result = os_execute(build_link_line())
if not run or result ~= 0 then -- have to link to run
cleanup_build()
return true, result == 0, nil -- compile, maybe link, no run
end
result = os.execute(build_run_line())
local output = readfile("./premakecheck.stdout", "rt")
result = os_execute(build_run_line())
local output = readfile("./premakecheck.stdout", "r")
cleanup_build()
return true, true, output -- compile, link, ran
end
libs/SDL2/premake/util/sdl_gen_config.lua
+2 -2
View File
@@ -33,8 +33,8 @@ local insertLocation
-- This function begins config header generation given the name of the generated
-- file and the name of the template file to use.
function startGeneration(file, template)
configFile = fileopen(file, "wt")
templateFileContents = readfile(template, "rt")
configFile = fileopen(file, "w")
templateFileContents = readfile(template, "r")
insertLocation = templateFileContents:find(searchKey)
if insertLocation then
configFile:write(templateFileContents:sub(1, insertLocation - 1))