len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix checkwps (configure actually) to compile without SDL, and add samsung YH* to targets.txt

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22794 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-09-23 09:00:44 +00:00
parent 77c4a38f05
commit eab9a72abd
2 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/checkwps/targets.txt
View file

@ -39,3 +39,6 @@ SANSA_FUZE fuze
ELIO_TPJ1022 tpj1022 ELIO_TPJ1022 tpj1022
ONDA_VX747 ondavx747 ONDA_VX747 ondavx747
ONDA_VX777 ondavx777 ONDA_VX777 ondavx777
SAMSUNG_YH820 yh820
SAMSUNG_YH920 yh920
SAMSUNG_YH925 yh925

72
tools/configure vendored
View file

@ -42,11 +42,17 @@ crosswincc () {
# naive approach to selecting a mingw cross-compiler on linux/*nix # naive approach to selecting a mingw cross-compiler on linux/*nix
echo "Enabling win32 crosscompiling" echo "Enabling win32 crosscompiling"
sdl=`findtool sdl-config`
sdl_cflags=""
sdl_libs=""
prefixtools i586-mingw32msvc- prefixtools i586-mingw32msvc-
if [ $1 = "sdl" -a -z "$sdl"]; then
sdl_cflags="`sdl-config --cflags`"
sdl_libs="`sdl-config --libs`"
fi
# add cross-compiler option(s) # add cross-compiler option(s)
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS " + $sdl_cflags
LDOPTS="`sdl-config --libs` -mconsole" LDOPTS="-mconsole" + $sdl_libs
output="rockboxui.exe" # use this as output binary name output="rockboxui.exe" # use this as output binary name
crosscompile="yes" crosscompile="yes"
@ -81,15 +87,21 @@ simcc () {
GCCOPTS='-W -Wall -g -fno-builtin' GCCOPTS='-W -Wall -g -fno-builtin'
output="rockboxui" # use this as default output binary name output="rockboxui" # use this as default output binary name
# generic sdl-config checker
sdl=`findtool sdl-config` sdl=`findtool sdl-config`
sdl_cflags=""
sdl_libs=""
if [ -z "$sdl" ]; then if [ $1 = "sdl" ]; then
echo "configure didn't find sdl-config, which indicates that you" if [ -z "$sdl" ]; then
echo "don't have SDL (properly) installed. Please correct and" echo "configure didn't find sdl-config, which indicates that you"
echo "re-run configure!" echo "don't have SDL (properly) installed. Please correct and"
exit 1 echo "re-run configure!"
exit 1
else
# generic sdl-config checker
sdl_cflags=`sdl-config --cflags`
sdl_libs=`sdl-config --libs`
fi
fi fi
# default share option, override below if needed # default share option, override below if needed
@ -100,8 +112,8 @@ simcc () {
echo "Cygwin host detected" echo "Cygwin host detected"
# sdl version # sdl version
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS $sdl_cflags"
LDOPTS="`sdl-config --libs` -mconsole" LDOPTS="-mconsole $sdl_libs"
output="rockboxui.exe" # use this as output binary name output="rockboxui.exe" # use this as output binary name
;; ;;
@ -110,35 +122,38 @@ simcc () {
echo "MinGW host detected" echo "MinGW host detected"
# sdl version # sdl version
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS $sdl_cflags"
LDOPTS="`sdl-config --libs` -mconsole" LDOPTS="-mconsole $sdl_libs"
output="rockboxui.exe" # use this as output binary name output="rockboxui.exe" # use this as output binary name
;; ;;
Linux) Linux)
echo "Linux host detected" echo "Linux host detected"
if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then GCCOPTS="$GCCOPTS $sdl_cflags"
LDOPTS="$sdl_libs"
# cannot crosscompile without SDL installed
if [ -n "$sdl" ]; then
if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then
# Enable crosscompiling if sdl-config is from Windows SDL # Enable crosscompiling if sdl-config is from Windows SDL
crosswincc # overrides GCCOPTS and LDOPTS
else crosswincc $1
GCCOPTS="$GCCOPTS `sdl-config --cflags`" fi
LDOPTS="`sdl-config --libs`"
fi fi
;; ;;
FreeBSD) FreeBSD)
echo "FreeBSD host detected" echo "FreeBSD host detected"
# sdl version # sdl version
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS $sdl_cflags"
LDOPTS="`sdl-config --libs`" LDOPTS="$sdl_libs"
;; ;;
Darwin) Darwin)
echo "Darwin host detected" echo "Darwin host detected"
# sdl version # sdl version
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS $sdl_cflags"
LDOPTS="`sdl-config --libs`" LDOPTS="$sdl_libs"
SHARED_FLAG="-dynamiclib -Wl\,-single_module" SHARED_FLAG="-dynamiclib -Wl\,-single_module"
;; ;;
@ -181,7 +196,12 @@ EOF
# little endian # little endian
endian="little" endian="little"
fi fi
echo "Simulator environment deemed $endian endian"
if [ $1 = "sdl" ]; then
echo "Simulator environment deemed $endian endian"
elif [ $1 = "checkwps" ]; then
echo "CheckWPS environment deemed $endian endian"
fi
# use wildcard here to make it work even if it was named *.exe like # use wildcard here to make it work even if it was named *.exe like
# on cygwin # on cygwin
@ -2513,7 +2533,7 @@ fi
;; ;;
[Cc]) [Cc])
uname=`uname` uname=`uname`
simcc simcc "checkwps"
toolset=''; toolset='';
t_cpu=''; t_cpu='';
GCCOPTS=''; GCCOPTS='';
@ -2565,7 +2585,7 @@ uname=`uname`
if [ "yes" = "$simulator" ]; then if [ "yes" = "$simulator" ]; then
# setup compiler and things for simulator # setup compiler and things for simulator
simcc simcc "sdl"
if [ -d "simdisk" ]; then if [ -d "simdisk" ]; then
echo "Subdirectory 'simdisk' already present" echo "Subdirectory 'simdisk' already present"