eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 2802 - [patch] Fix android build compiling in wrong filesystem implementation

Browse source 
Jonas Kulla

The configure script didn't differentiate between Linux and Android, unconditionally compiling in the unix implementation of SDL_sysfilesystem.c.

I'm probably one of the very few people building SDL for android using classic configure + standalone toolchain, so this has gone undetected all along.
This commit is contained in:
Philipp Wiesemann 2015-01-26 22:00:29 +01:00
commit b48e54aafe
1635 changed files with 472973 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
premake/VisualC/build-scripts/build.all.vs2010.bat Executable file
View file

@ -0,0 +1,5 @@
@echo off
cd ..\VS2010
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
msbuild /m SDL.sln /property:Configuration=Debug
pause

81
premake/VisualC/build-scripts/check.bin.compatibility.vs2010.bat Executable file
View file

@ -0,0 +1,81 @@
@echo off
title Building Premake VS2010 Environment...
call build.all.vs2010.bat
title Building SDL VS2010 Environment...
cd %~dp0
cd ..\..\..\VisualC
msbuild /m SDL_VS2010.sln /t:Clean,Build /property:Configuration=Debug
pause
title Running SDL VS2010 tests with premake SDL2.dll...
cd tests
call :pass checkkeys
call :pass loopwave
call :pass testatomic
call :pass testaudioinfo
call :pass testautomation
call :pass testdraw2
call :pass testerror
call :pass testfile
call :pass testgamecontroller
call :pass testgesture
call :pass testgl2
call :pass testgles
call :pass testhaptic
call :pass testiconv
call :pass testime
call :pass testintersection
call :pass testjoystick
call :pass testkeys
::call :pass testloadso
call :pass testlock
call :pass testmessage
call :pass testmultiaudio
call :pass testnative
call :pass testoverlay2
call :pass testplatform
call :pass testpower
call :pass testrelative
call :pass testrendercopyex
call :pass testrendertarget
::call :pass testresample
call :pass testrumble
call :pass testscale
call :pass testsem 0
call :pass testshader
call :pass testshape "../../../../../../test/sample.bmp"
call :pass testsprite2
call :pass testspriteminimal
call :pass teststreaming
call :pass testthread
call :pass testtimer
call :pass testver
call :pass testwm2
call :pass torturethread
:: leave the tests directory
cd ..
:: exit batch
goto :eof
:: pass label (similar to pass function in the Xcode tests command script)
:pass
:: if it does not exist, break procedure
if not exist %1\Win32\Debug goto endfunc
:: goto directory
echo Running SDL VS2010 %1 with premake SDL2.dll...
title Running SDL VS2010 %1 with premake SDL2.dll...
cd %1\Win32\Debug
:: remove old SDL2.dll
rm SDL2.dll
:: copy new SDL2.dll (~dp0 is get directory of current location of batch file)
copy %~dp0\..\SDL2\Win32\Debug\SDL2.dll .\SDL2.dll
:: execute test
".\%1.exe" %2
cd ..\..\..
pause
:endfunc
goto :eof

9
premake/VisualC/build-scripts/clean_premake.bat Executable file
View file

@ -0,0 +1,9 @@
@echo off
cd ..
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2008 clean
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2010 clean
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2012 clean
if exist VS2008 rmdir VS2008
if exist VS2010 rmdir VS2010
if exist VS2012 rmdir VS2012
pause

9
premake/VisualC/build-scripts/generate.all.bat Executable file
View file

@ -0,0 +1,9 @@
@echo off
cd ..
title Generating VS2008...
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2008 vs2008
title Generating VS2010...
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2010 vs2010
title Generating VS2012...
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2012 vs2012
pause

BIN
premake/VisualC/build-scripts/premake4.exe Executable file
View file

Binary file not shown.

108
premake/VisualC/build-scripts/run.tests.vs2010.bat Executable file
View file

@ -0,0 +1,108 @@
@echo off
cd ..\VS2010\tests
call :pass checkkeys
call :pass loopwave
call :pass testatomic
call :pass testaudioinfo
call :pass testautomation
call :pass testdraw2
call :pass testchessboard
call :pass testerror
call :pass testfile
call :pass testfilesystem
call :pass testgamecontroller
call :pass testgesture
call :pass testgl2
call :pass testgles
call :pass testhaptic
call :pass testiconv
call :pass testime
call :pass testintersection
call :pass testjoystick
call :pass testkeys
::call :pass testloadso
call :pass testlock
call :pass testmessage
call :pass testmultiaudio
call :pass testnative
call :pass testoverlay2
call :pass testplatform
call :pass testpower
call :pass testrelative
call :pass testrendercopyex
call :pass testrendertarget
call :pass testresample sample.wav newsample.wav 44100
call :pass testrumble
call :pass testscale
call :pass testsem 1
call :pass testshader
call :testspecial testshape .\shapes
call :testspecial testshape .\shapes
call :testspecial testshape .\shapes
call :pass testsprite2
call :pass testspriteminimal
call :pass teststreaming
call :pass testthread
call :pass testtimer
call :pass testver
call :pass testwm2
call :pass torturethread
:: leave the tests directory
cd ..
:: exit batch
goto :eof
:testspecial
if not exist %1\Win32\Debug goto :eof
cd %1\Win32\Debug
call :randomfile %2
cd ..\..\..
call :pass %1 %RETURN%
goto :eof
:: pass label (similar to pass function in the Xcode tests command script)
:pass
setlocal enabledelayedexpansion
set args=
set /A count=0
for %%x IN (%*) DO (
if NOT !count! EQU 0 set args=!args! %%x
set /A count=%count% + 1
)
endlocal & set callargs=%args%
:: if it does not exist, break procedure
if not exist %1\Win32\Debug goto endfunc
:: goto directory
echo Testing: %1
title Testing: %1
cd %1\Win32\Debug
:: execute test
".\%1.exe"%callargs%
cd ..\..\..
pause
:endfunc
goto :eof
:randomfile
setlocal enabledelayedexpansion
set count=0
if not exist %1 goto :eof
for %%d in (%1\*.*) DO (
set /A count=count + 1
)
set /A count=%RANDOM% %% %count%
for %%d in (%1\*.*) DO (
if !count! EQU 0 (
set rfile=%%d
goto endrfile
)
set /A count=count-1
)
:endrfile
set tmprfile=!rfile!
endlocal & set RETURN=%tmprfile%
goto :eof

4
premake/VisualC/build-scripts/vs2008.bat Executable file
View file

@ -0,0 +1,4 @@
@echo off
cd ..
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2008 vs2008
pause

4
premake/VisualC/build-scripts/vs2010.bat Executable file
View file

@ -0,0 +1,4 @@
@echo off
cd ..
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2010 vs2010
pause

4
premake/VisualC/build-scripts/vs2012.bat Executable file
View file

@ -0,0 +1,4 @@
@echo off
cd ..
%~dp0\premake4.exe --file=..\premake4.lua --to=.\VisualC\VS2012 vs2012
pause