Skip to content

Commit

Permalink
[Graphics] Update to SDL 2.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
xen2 committed Jan 14, 2019
1 parent fc6e267 commit 19f3fdc
Show file tree
Hide file tree
Showing 53 changed files with 49 additions and 1,493 deletions.
3 changes: 0 additions & 3 deletions deps/SDL2-CS/Linux/SDL2-CS.dll

This file was deleted.

4 changes: 2 additions & 2 deletions deps/SDL2-CS/SDL2-CS.dll
Git LFS file not shown
21 changes: 16 additions & 5 deletions deps/SDL2-CS/SDL2-CS.dll.config
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 3 additions & 17 deletions deps/SDL2-CS/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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\*.* .
2 changes: 1 addition & 1 deletion deps/SDL2-CS/checkout.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions deps/SDL2-CS/macOS/SDL2-CS.dll

This file was deleted.

32 changes: 0 additions & 32 deletions deps/SDL2/LICENSE.FLAC.txt

This file was deleted.

65 changes: 0 additions & 65 deletions deps/SDL2/LICENSE.jpeg.txt

This file was deleted.

Loading

0 comments on commit 19f3fdc

Please sign in to comment.