From: Nils Kneuper Date: Sat, 24 May 2014 20:25:12 +0000 (+0200) Subject: some almost useless updates... X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-misc.git;a=commitdiff_plain;h=1205b1eee83c19d618a88e553e5ddedc46e555e6 some almost useless updates... 1) Update comment for building the Wesnoth binary in Pandora.cmake to match "upstream" 2) Add commented out lines for latest code bench crosscompiler (the compiler does not work for me, but maybe someone else has more luck? it fails linking both Wesnoth as well as Snes9x) --- diff --git a/sdk_installer/openpandora_toolchain.sh b/sdk_installer/openpandora_toolchain.sh index ec984b8..6863588 100755 --- a/sdk_installer/openpandora_toolchain.sh +++ b/sdk_installer/openpandora_toolchain.sh @@ -105,6 +105,8 @@ PNDSDK_DIR=$HOME/pandora-dev #PNDSDK=$PNDSDK_DIR/arm-2010.09 #PNDSDK=$PNDSDK_DIR/arm-2011.03 PNDSDK=$PNDSDK_DIR/arm-2011.09 +#PNDSDK=$PNDSDK_DIR/arm-2013.11 + USEFUL_TOOLS_DIR=$PNDSDK_DIR/sdk_utils TARGET_SYS=arm-none-linux-gnueabi @@ -122,9 +124,14 @@ TARGET_SYS=arm-none-linux-gnueabi TOOLCHAIN_URL=http://sourcery.mentor.com/sgpp/lite/arm/portal/package9728/public/arm-none-linux-gnueabi/arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_TARBALL_NAME=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_MD5=56d9a77654d012914e703dc8d9383246 +#TOOLCHAIN_URL=https://sourcery.mentor.com/GNUToolchain/package12225/public/arm-none-linux-gnueabi/arm-2013.11-33-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 +#TOOLCHAIN_TARBALL_NAME=arm-2013.11-33-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 +#TOOLCHAIN_MD5=56276ed5d7a8edffa9d536a18284e5e0 + OPKG_VERSION=opkg-0.1.8 OPKG_ARCHIVE_MD5=c714ce0e4863bf1315e3b6913ffe3299 OPKG_ARCHIVE=$OPKG_VERSION.tar.gz + #PKGCONFIG_VERSION=pkg-config-0.25 #PKGCONFIG_ARCHIVE_MD5=a3270bab3f4b69b7dc6dbdacbcae9745 PKGCONFIG_VERSION=pkg-config-0.26 @@ -780,7 +787,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) #PATH=$PNDSDK/usr/bin:\$PATH CFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" CXXFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" cmake -DCMAKE_BUILD_TYPE=release -DENABLE_STRICT_COMPILATION=off -DCMAKE_TOOLCHAIN_FILE=$USEFUL_TOOLS_DIR/PandoraToolchain.cmake -DPKG_CONFIG_EXECUTABLE=$PNDSDK/bin/arm-none-linux-gnueabi-pkg-config -DSDL_CONFIG=$PNDSDK/usr/bin/sdl-config -DLIBINTL_INCLUDE_DIR=$PNDSDK/arm-none-linux-gnueabi/libc/usr/include/ -DPREFERENCES_DIR=wesnoth-1.10_userdata ../wesnoth-1.10.x # #current 1.11 setup: -#PATH=$PNDSDK/usr/bin:\$PATH CFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" CXXFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" cmake -DCMAKE_BUILD_TYPE=release -DENABLE_STRICT_COMPILATION=off -DCMAKE_TOOLCHAIN_FILE=$USEFUL_TOOLS_DIR/PandoraToolchain.cmake -DPKG_CONFIG_EXECUTABLE=$PNDSDK/bin/arm-none-linux-gnueabi-pkg-config -DSDL_CONFIG=$PNDSDK/usr/bin/sdl-config -DLIBINTL_INCLUDE_DIR=$PNDSDK/arm-none-linux-gnueabi/libc/usr/include/ -DPREFERENCES_DIR=wesnoth-1.11_userdata ../wesnoth-1.11.x +#PATH=$PNDSDK/usr/bin:\$PATH CFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" CXXFLAGS="-DPANDORA -O3 -pipe -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" cmake -DCMAKE_BUILD_TYPE=release -DENABLE_STRICT_COMPILATION=off -DENABLE_PANDORA=on -DCMAKE_TOOLCHAIN_FILE=$USEFUL_TOOLS_DIR/PandoraToolchain.cmake -DPKG_CONFIG_EXECUTABLE=$PNDSDK/bin/arm-none-linux-gnueabi-pkg-config -DSDL_CONFIG=$PNDSDK/usr/bin/sdl-config -DLIBINTL_INCLUDE_DIR=$PNDSDK/arm-none-linux-gnueabi/libc/usr/include/ -DPREFERENCES_DIR=wesnoth-1.11_userdata ../wesnoth-1.11.x _END_ cecho "Creating $USEFUL_TOOLS_DIR/pandora_configure.sh" $green