Skip to content
Permalink
Browse files

[Graphics] Update to SDL 2.0.9

  • Loading branch information
xen2 committed Jan 13, 2019
1 parent fc6e267 commit 19f3fdcaec44e2e7a67bc8a4f171ae7a12b9929e
Showing with 49 additions and 1,493 deletions.
  1. +0 −3 deps/SDL2-CS/Linux/SDL2-CS.dll
  2. +2 −2 deps/SDL2-CS/SDL2-CS.dll
  3. +16 −5 deps/SDL2-CS/SDL2-CS.dll.config
  4. +3 −17 deps/SDL2-CS/build.bat
  5. +1 −1 deps/SDL2-CS/checkout.bat
  6. +0 −3 deps/SDL2-CS/macOS/SDL2-CS.dll
  7. +0 −32 deps/SDL2/LICENSE.FLAC.txt
  8. +0 −65 deps/SDL2/LICENSE.jpeg.txt
  9. +0 −486 deps/SDL2/LICENSE.mikmod.txt
  10. +0 −1 deps/SDL2/LICENSE.modplug.txt
  11. +0 −32 deps/SDL2/LICENSE.ogg-vorbis.txt
  12. +0 −114 deps/SDL2/LICENSE.png.txt
  13. +0 −485 deps/SDL2/LICENSE.smpeg.txt
  14. +0 −25 deps/SDL2/LICENSE.tiff.txt
  15. +0 −34 deps/SDL2/LICENSE.webp.txt
  16. +0 −31 deps/SDL2/LICENSE.zlib.txt
  17. +2 −2 deps/SDL2/Windows/x64/SDL2.dll
  18. +0 −3 deps/SDL2/Windows/x64/SDL2_image.dll
  19. +0 −3 deps/SDL2/Windows/x64/SDL2_mixer.dll
  20. +0 −3 deps/SDL2/Windows/x64/libFLAC-8.dll
  21. +0 −3 deps/SDL2/Windows/x64/libjpeg-9.dll
  22. +0 −3 deps/SDL2/Windows/x64/libmikmod-2.dll
  23. +0 −3 deps/SDL2/Windows/x64/libmodplug-1.dll
  24. +0 −3 deps/SDL2/Windows/x64/libogg-0.dll
  25. +0 −3 deps/SDL2/Windows/x64/libpng16-16.dll
  26. +0 −3 deps/SDL2/Windows/x64/libtiff-5.dll
  27. +0 −3 deps/SDL2/Windows/x64/libvorbis-0.dll
  28. +0 −3 deps/SDL2/Windows/x64/libvorbisfile-3.dll
  29. +0 −3 deps/SDL2/Windows/x64/libwebp-4.dll
  30. +0 −3 deps/SDL2/Windows/x64/smpeg2.dll
  31. +0 −3 deps/SDL2/Windows/x64/zlib1.dll
  32. +2 −2 deps/SDL2/Windows/x86/SDL2.dll
  33. +0 −3 deps/SDL2/Windows/x86/SDL2_image.dll
  34. +0 −3 deps/SDL2/Windows/x86/SDL2_mixer.dll
  35. +0 −3 deps/SDL2/Windows/x86/libFLAC-8.dll
  36. +0 −3 deps/SDL2/Windows/x86/libjpeg-9.dll
  37. +0 −3 deps/SDL2/Windows/x86/libmikmod-2.dll
  38. +0 −3 deps/SDL2/Windows/x86/libmodplug-1.dll
  39. +0 −3 deps/SDL2/Windows/x86/libogg-0.dll
  40. +0 −3 deps/SDL2/Windows/x86/libpng16-16.dll
  41. +0 −3 deps/SDL2/Windows/x86/libtiff-5.dll
  42. +0 −3 deps/SDL2/Windows/x86/libvorbis-0.dll
  43. +0 −3 deps/SDL2/Windows/x86/libvorbisfile-3.dll
  44. +0 −3 deps/SDL2/Windows/x86/libwebp-4.dll
  45. +0 −3 deps/SDL2/Windows/x86/smpeg2.dll
  46. +0 −3 deps/SDL2/Windows/x86/zlib1.dll
  47. +3 −0 deps/SDL2/macOS/libSDL2.dylib
  48. +0 −3 deps/SDL2/macOS/x64/libSDL2-2.0.0.dylib
  49. +0 −3 deps/SDL2/macOS/x86/libSDL2-2.0.0.dylib
  50. +4 −2 sources/engine/Xenko.Graphics/SDL/Cursor.cs
  51. +2 −0 sources/engine/Xenko.Graphics/SDL/Window.cs
  52. +8 −39 sources/engine/Xenko.Graphics/Vulkan/SwapChainGraphicsPresenter.Vulkan.cs
  53. +6 −22 sources/targets/SDL.targets

This file was deleted.

Git LFS file not shown
@@ -1,7 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<dllmap dll="SDL2.dll" target="libSDL2.so">
<dllentry dll="libc.so.6" name="SDL_malloc" target="malloc"/>
<dllentry dll="libSDL2.so"/>
</dllmap>
<dllmap dll="SDL2_mixer.dll" target="libSDL2_mixer.so"/>
<dllmap dll="SDL2" os="windows" target="SDL2.dll"/>
<dllmap dll="SDL2" os="osx" target="libSDL2-2.0.0.dylib"/>
<dllmap dll="SDL2" os="linux" target="libSDL2-2.0.so.0"/>

<dllmap dll="SDL2_image" os="windows" target="SDL2_image.dll"/>
<dllmap dll="SDL2_image" os="osx" target="libSDL2_image-2.0.0.dylib"/>
<dllmap dll="SDL2_image" os="linux" target="libSDL2_image-2.0.so.0"/>

<dllmap dll="SDL2_mixer" os="windows" target="SDL2_mixer.dll"/>
<dllmap dll="SDL2_mixer" os="osx" target="libSDL2_mixer-2.0.0.dylib"/>
<dllmap dll="SDL2_mixer" os="linux" target="libSDL2_mixer-2.0.so.0"/>

<dllmap dll="SDL2_ttf" os="windows" target="SDL2_ttf.dll"/>
<dllmap dll="SDL2_ttf" os="osx" target="libSDL2_ttf-2.0.0.dylib"/>
<dllmap dll="SDL2_ttf" os="linux" target="libSDL2_ttf-2.0.so.0"/>
</configuration>
@@ -8,29 +8,15 @@ if "%1" == "" (
pushd ..\..\externals\SDL2-CS

REM SDL2-CS
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\Tools\VsMSBuildCmd.bat"
msbuild /p:XenkoRuntime="CoreCLR" /p:Configuration="%1" /p:Platform="Any CPU" SDL2-CS.sln
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat"
msbuild /p:Configuration="%1" SDL2-CS.Core.csproj /restore
if %ERRORLEVEL% neq 0 (
echo Error during compilation
popd
EXIT /B %ERRORLEVEL%
)

popd
rem Copying assemblies
copy ..\..\externals\SDL2-CS\bin\%1\SDL2-CS.dll .
if exist ..\..\externals\SDL2-CS\bin\%1\SDL2-CS.pdb copy ..\..\externals\SDL2-CS\bin\%1\SDL2-CS.pdb .

pushd ..\..\externals\SDL2-CS
msbuild /p:XenkoRuntime="CoreCLR" /p:Configuration="%1" /p:Platform="Linux" SDL2-CS.sln
if %ERRORLEVEL% neq 0 (
echo Error during Linux compilation
popd
EXIT /B %ERRORLEVEL%
)

popd
rem Copying assemblies
copy ..\..\externals\SDL2-CS\bin\Linux\%1\SDL2-CS.dll Linux\
if exist ..\..\externals\SDL2-CS\bin\Linux\%1\SDL2-CS.pdb copy ..\..\externals\SDL2-CS\bin\Linux\%1\SDL2-CS.pdb Linux\

copy ..\..\externals\SDL2-CS\bin\%1\netstandard2.0\*.* .
@@ -6,4 +6,4 @@ IF NOT ERRORLEVEL 0 (
ECHO "Could not find git.exe"
EXIT /B %ERRORLEVEL%
)
%GIT_CMD% clone "https://github.com/xenko3d/SDL2-CS.git" ../../externals/SDL2-CS
%GIT_CMD% clone "https://github.com/flibitijibibo/SDL2-CS.git" ../../externals/SDL2-CS

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 19f3fdc

Please sign in to comment.
You can’t perform that action at this time.