mirror of
https://github.com/libretro/libretro-super
synced 2024-11-28 11:14:11 +00:00
Merge pull request #231 from iKarith/master
Whitespace and == with sh test. Also an old bsnes rule that didn't get updated
This commit is contained in:
Twinaphex
commit
4cceccff43
File diff suppressed because it is too large
Load Diff
@ -25,8 +25,7 @@ while read line; do
|
||||
KEY=`echo $line | cut --fields=1 --delimiter=" "`
|
||||
VALUE=`echo $line | cut --fields=2 --delimiter=" "`
|
||||
|
||||
if [ "${KEY}" == "PATH" ];
|
||||
then
|
||||
if [ "${KEY}" = "PATH" ]; then
|
||||
export PATH=${VALUE}:${ORIGPATH}
|
||||
echo New PATH: $PATH
|
||||
|
||||
@ -34,7 +33,7 @@ while read line; do
|
||||
export ${KEY}=${VALUE}
|
||||
echo $KEY: $VALUE
|
||||
fi
|
||||
done < $1.conf
|
||||
done < $1.conf
|
||||
echo
|
||||
echo
|
||||
|
||||
@ -54,8 +53,7 @@ read_link()
|
||||
TARGET_FILE="$1"
|
||||
cd $(dirname "$TARGET_FILE")
|
||||
TARGET_FILE=$(basename "$TARGET_FILE")
|
||||
while [ -L "$TARGET_FILE" ]
|
||||
do
|
||||
while [ -L "$TARGET_FILE" ]; do
|
||||
TARGET_FILE=$(readlink "$TARGET_FILE")
|
||||
cd $(dirname "$TARGET_FILE")
|
||||
TARGET_FILE=$(basename "$TARGET_FILE")
|
||||
@ -75,18 +73,17 @@ fi
|
||||
|
||||
mkdir -v -p "$RARCH_DIST_DIR"
|
||||
|
||||
if [ "${PLATFORM}" == "android" ];
|
||||
then
|
||||
if [ "${PLATFORM}" = "android" ]; then
|
||||
|
||||
IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
|
||||
for a in "${ABIS[@]}"; do
|
||||
echo $a
|
||||
if [ -d $RARCH_DIST_DIR/${a} ]; then
|
||||
echo "Directory $RARCH_DIST_DIR/${a} already exists, skipping creation..."
|
||||
else
|
||||
mkdir $RARCH_DIST_DIR/${a}
|
||||
fi
|
||||
done
|
||||
IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
|
||||
for a in "${ABIS[@]}"; do
|
||||
echo $a
|
||||
if [ -d $RARCH_DIST_DIR/${a} ]; then
|
||||
echo "Directory $RARCH_DIST_DIR/${a} already exists, skipping creation..."
|
||||
else
|
||||
mkdir $RARCH_DIST_DIR/${a}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$HOST_CC" ]; then
|
||||
@ -111,32 +108,32 @@ fi
|
||||
|
||||
|
||||
if [ -z "$CC" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CC=cc
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CC=mingw32-gcc
|
||||
else
|
||||
else
|
||||
CC=gcc
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$CXX" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CXX=c++
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++"
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CXX=mingw32-g++
|
||||
CXX11=mingw32-g++
|
||||
else
|
||||
else
|
||||
CXX=g++
|
||||
CXX11=g++
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${CC}" ] && [ "${CXX}" ]; then
|
||||
COMPILER="CC=${CC} CXX=${CXX}"
|
||||
COMPILER="CC=${CC} CXX=${CXX}"
|
||||
else
|
||||
COMPILER=""
|
||||
COMPILER=""
|
||||
fi
|
||||
|
||||
echo
|
||||
@ -153,7 +150,7 @@ RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
|
||||
RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
|
||||
|
||||
check_opengl() {
|
||||
if [ "${BUILD_LIBRETRO_GL}" ]; then
|
||||
if [ "${BUILD_LIBRETRO_GL}" ]; then
|
||||
if [ "${ENABLE_GLES}" ]; then
|
||||
echo '=== OpenGL ES enabled ==='
|
||||
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-gles"
|
||||
@ -165,12 +162,12 @@ check_opengl() {
|
||||
fi
|
||||
else
|
||||
echo '=== OpenGL disabled in build ==='
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
reset_compiler_targets() {
|
||||
export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET
|
||||
export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
|
||||
export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET
|
||||
export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
|
||||
}
|
||||
|
||||
|
||||
@ -199,21 +196,18 @@ build_libretro_generic_makefile() {
|
||||
cd $DIR
|
||||
cd $SUBDIR
|
||||
|
||||
if [ "${NAME}" == "mame078" ];
|
||||
then
|
||||
OLDJ=$JOBS
|
||||
if [ "${NAME}" = "mame078" ]; then
|
||||
OLDJ=$JOBS
|
||||
JOBS=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
echo "cleaning up..."
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
@ -221,23 +215,20 @@ build_libretro_generic_makefile() {
|
||||
fi
|
||||
|
||||
echo "compiling..."
|
||||
if [ -z "${ARGS}" ]
|
||||
then
|
||||
if [ -z "${ARGS}" ]; then
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
|
||||
else
|
||||
if [ "${NAME}" == "mame2010" ];
|
||||
then
|
||||
if [ "${NAME}" = "mame2010" ]; then
|
||||
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools
|
||||
fi
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1 build successful ($jobid)"
|
||||
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT}
|
||||
else
|
||||
@ -266,13 +257,11 @@ build_libretro_generic_theos() {
|
||||
ln -s $THEOS theos
|
||||
|
||||
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
echo "cleaning up..."
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
@ -280,8 +269,7 @@ build_libretro_generic_theos() {
|
||||
fi
|
||||
|
||||
echo "compiling..."
|
||||
if [ -z "${ARGS}" ]
|
||||
then
|
||||
if [ -z "${ARGS}" ]; then
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
|
||||
else
|
||||
@ -289,8 +277,7 @@ build_libretro_generic_theos() {
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1 build successful ($jobid)"
|
||||
cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
|
||||
else
|
||||
@ -315,13 +302,11 @@ build_libretro_generic_jni() {
|
||||
cd ${DIR}/${SUBDIR}
|
||||
|
||||
for a in "${ABIS[@]}"; do
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean"
|
||||
${NDK} -j${JOBS} ${ARGS} APP_ABI=${a} clean
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $a $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $a $1 cleanup failure!
|
||||
@ -329,16 +314,14 @@ build_libretro_generic_jni() {
|
||||
fi
|
||||
|
||||
echo "compiling for ${a}..."
|
||||
if [ -z "${ARGS}" ]
|
||||
then
|
||||
if [ -z "${ARGS}" ]; then
|
||||
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
|
||||
${NDK} -j${JOBS} APP_ABI=${a}
|
||||
else
|
||||
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} "
|
||||
${NDK} -j${JOBS} APP_ABI=${a} ${ARGS}
|
||||
fi
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1-$a build successful ($jobid)"
|
||||
echo BUILDBOT JOB: $MESSAGE
|
||||
buildbot_log "$MESSAGE"
|
||||
@ -349,8 +332,8 @@ build_libretro_generic_jni() {
|
||||
buildbot_log "$MESSAGE"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -370,30 +353,26 @@ build_libretro_bsnes_jni() {
|
||||
cd ${DIR}/${SUBDIR}
|
||||
|
||||
for a in "${ABIS[@]}"; do
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${NDK} -j${JOBS} APP_ABI=${a} clean"
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${NDK} -j${JOBS} APP_ABI=${a} clean"
|
||||
${NDK} -j${JOBS} APP_ABI=${a} clean
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
fi
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "compiling for ${a}..."
|
||||
if [ -z "${ARGS}" ]
|
||||
then
|
||||
echo "compiling for ${a}..."
|
||||
if [ -z "${ARGS}" ]; then
|
||||
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
|
||||
${NDK} -j${JOBS} APP_ABI=${a}
|
||||
else
|
||||
echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
|
||||
${NDK} -j${JOBS} APP_ABI=${a}
|
||||
fi
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1 build successful ($jobid)"
|
||||
cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}
|
||||
else
|
||||
@ -422,13 +401,11 @@ build_libretro_generic_gl_makefile() {
|
||||
cd $DIR
|
||||
cd $SUBDIR
|
||||
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
echo "cleaning up..."
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
@ -436,8 +413,7 @@ build_libretro_generic_gl_makefile() {
|
||||
fi
|
||||
|
||||
echo "compiling..."
|
||||
if [ -z "${ARGS}" ];
|
||||
then
|
||||
if [ -z "${ARGS}" ]; then
|
||||
echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
|
||||
else
|
||||
@ -445,8 +421,7 @@ build_libretro_generic_gl_makefile() {
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1 build successful ($jobid)"
|
||||
cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
|
||||
else
|
||||
@ -475,22 +450,19 @@ build_libretro_bsnes() {
|
||||
cd $DIR
|
||||
|
||||
|
||||
if [ -z "${NOCLEAN}" ];
|
||||
then
|
||||
echo "cleaning up..."
|
||||
if [ -z "${NOCLEAN}" ]; then
|
||||
echo "cleaning up..."
|
||||
|
||||
rm -f obj/*.{o,"${FORMAT_EXT}"}
|
||||
rm -f out/*.{o,"${FORMAT_EXT}"}
|
||||
|
||||
|
||||
if [ "${PROFILE}" == "cpp98" -o "${PROFILE}" == "bnes" ];
|
||||
then
|
||||
${MAKE} clean
|
||||
fi
|
||||
if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
|
||||
${MAKE} clean
|
||||
fi
|
||||
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $1 cleanup failure!
|
||||
@ -500,11 +472,9 @@ build_libretro_bsnes() {
|
||||
echo "compiling..."
|
||||
|
||||
|
||||
if [ "${PROFILE}" == "cpp98" ];
|
||||
then
|
||||
if [ "${PROFILE}" = "cpp98" ]; then
|
||||
${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
|
||||
elif [ "${PROFILE}" == "bnes" ];
|
||||
then
|
||||
elif [ "${PROFILE}" = "bnes" ]; then
|
||||
echo "build command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
|
||||
${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
|
||||
else
|
||||
@ -512,14 +482,11 @@ build_libretro_bsnes() {
|
||||
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="$1 build successful ($jobid)"
|
||||
if [ "${PROFILE}" == "cpp98" ];
|
||||
then
|
||||
if [ "${PROFILE}" = "cpp98" ]; then
|
||||
cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
|
||||
elif [ "${PROFILE}" == "bnes" ];
|
||||
then
|
||||
elif [ "${PROFILE}" = "bnes" ]; then
|
||||
cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
|
||||
else
|
||||
cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
|
||||
@ -537,8 +504,7 @@ build_libretro_bsnes() {
|
||||
#sleep 10
|
||||
export jobid=$1
|
||||
|
||||
if [ -z "$2" ]
|
||||
then
|
||||
if [ -z "$2" ]; then
|
||||
echo no argument supplied
|
||||
else
|
||||
echo processing $2 only
|
||||
@ -560,19 +526,16 @@ while read line; do
|
||||
SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
|
||||
|
||||
|
||||
if [ ! -z "$TASK" ]
|
||||
then
|
||||
if [ "${TASK}" != "${NAME}" ]
|
||||
then
|
||||
if [ ! -z "$TASK" ]; then
|
||||
if [ "${TASK}" != "${NAME}" ]; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if [ "${ENABLED}" == "YES" ];
|
||||
then
|
||||
if [ "${ENABLED}" = "YES" ]; then
|
||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||
echo
|
||||
echo
|
||||
echo URL: $URL
|
||||
echo REPO TYPE: $TYPE
|
||||
echo ENABLED: $ENABLED
|
||||
@ -586,69 +549,61 @@ while read line; do
|
||||
ARGS=""
|
||||
|
||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
|
||||
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
|
||||
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
|
||||
|
||||
echo ARGS: $ARGS
|
||||
echo
|
||||
echo
|
||||
|
||||
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
|
||||
then
|
||||
echo building core...
|
||||
if [ "${COMMAND}" == "GENERIC" ]; then
|
||||
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "GENERIC_GL" ]; then
|
||||
build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
|
||||
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "GENERIC_JNI" ]; then
|
||||
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "BSNES_JNI" ]; then
|
||||
build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "GENERIC_THEOS" ]; then
|
||||
build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" == "BSNES" ]; then
|
||||
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
|
||||
echo ARGS: $ARGS
|
||||
echo
|
||||
echo
|
||||
|
||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||
echo building core...
|
||||
if [ "${COMMAND}" = "GENERIC" ]; then
|
||||
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "GENERIC_GL" ]; then
|
||||
build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "GENERIC_ALT" ]; then
|
||||
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "GENERIC_JNI" ]; then
|
||||
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "BSNES_JNI" ]; then
|
||||
build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "GENERIC_THEOS" ]; then
|
||||
build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
|
||||
elif [ "${COMMAND}" = "BSNES" ]; then
|
||||
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
|
||||
fi
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $NAME already up-to-date...
|
||||
fi
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid $NAME already up-to-date...
|
||||
fi
|
||||
echo
|
||||
|
||||
fi
|
||||
@ -657,23 +612,20 @@ while read line; do
|
||||
PREVCORE=$NAME
|
||||
PREVBUILD=$BUILD
|
||||
|
||||
done < $1
|
||||
done < $1
|
||||
|
||||
echo
|
||||
cd $WORK
|
||||
BUILD=""
|
||||
|
||||
|
||||
if [ ! -z "$TASK" ]
|
||||
then
|
||||
if [ "${TASK}" != "retroarch" ]
|
||||
then
|
||||
exit
|
||||
if [ ! -z "$TASK" ]; then
|
||||
if [ "${TASK}" != "retroarch" ]; then
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}" == "YES" ];
|
||||
then
|
||||
if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
|
||||
|
||||
while read line; do
|
||||
|
||||
@ -684,15 +636,12 @@ then
|
||||
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
|
||||
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
|
||||
|
||||
if [ ! -z "$TASK" ]
|
||||
then
|
||||
if [ "${TASK}" != "${NAME}" ]
|
||||
then
|
||||
if [ ! -z "$TASK" ]; then
|
||||
if [ "${TASK}" != "${NAME}" ]; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
if [ "${ENABLED}" == "YES" ];
|
||||
then
|
||||
fi
|
||||
if [ "${ENABLED}" = "YES" ]; then
|
||||
echo "BUILDBOT JOB: $jobid Processing $NAME"
|
||||
echo
|
||||
echo NAME: $NAME
|
||||
@ -705,38 +654,32 @@ then
|
||||
ARGS=""
|
||||
|
||||
TEMP=`echo $line | cut --fields=9 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=10 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=11 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=12 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=13 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
TEMP=""
|
||||
TEMP=`echo $line | cut --fields=14 --delimiter=" "`
|
||||
if [ -n ${TEMP} ];
|
||||
then
|
||||
if [ -n ${TEMP} ]; then
|
||||
ARGS="${ARGS} ${TEMP}"
|
||||
fi
|
||||
|
||||
@ -748,9 +691,8 @@ then
|
||||
|
||||
echo
|
||||
echo
|
||||
done < $1.ra
|
||||
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
|
||||
then
|
||||
done < $1.ra
|
||||
if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
|
||||
|
||||
cd $3
|
||||
echo "BUILDBOT JOB: $jobid Building"
|
||||
@ -760,8 +702,7 @@ then
|
||||
cd audio/audio_filters
|
||||
echo "audio filter build command: ${MAKE}"
|
||||
$MAKE
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid audio filter build success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid audio filter build failure!
|
||||
@ -774,8 +715,7 @@ then
|
||||
cd gfx/video_filters
|
||||
echo "audio filter build command: ${MAKE}"
|
||||
$MAKE
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid video filter build success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid video filter build failure!
|
||||
@ -788,8 +728,7 @@ then
|
||||
echo "cleanup command: $MAKE clean"
|
||||
$MAKE clean
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid retroarch cleanup success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid retroarch cleanup failure!
|
||||
@ -799,8 +738,7 @@ then
|
||||
echo "configure command: $CONFIGURE"
|
||||
${CONFIGURE}
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
echo BUILDBOT JOB: $jobid retroarch configure success!
|
||||
else
|
||||
echo BUILDBOT JOB: $jobid retroarch configure failure!
|
||||
@ -810,8 +748,7 @@ then
|
||||
echo "build command: $MAKE -j${JOBS}"
|
||||
$MAKE -j${JOBS}
|
||||
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
if [ $? -eq 0 ]; then
|
||||
MESSAGE="retroarch build successful ($jobid)"
|
||||
echo $MESSAGE
|
||||
buildbot_log "$MESSAGE"
|
||||
|
||||
@ -13,13 +13,10 @@ case "$platform" in
|
||||
##
|
||||
|
||||
ios)
|
||||
# NOTE: This config requires a Mac with an Xcode version new enough for
|
||||
# its xcrun program to support -show-sdk-path. That pretty much
|
||||
# limits us to Xcode 5 and above unless someone wants to implement
|
||||
# older Xcode version support using an alternate method. Any such
|
||||
# support could only be for jailbreakers as any libretro core that
|
||||
# could ever be added to the App Store would require a recent SDK
|
||||
# and Xcode version to build.
|
||||
# NOTE: This config requires a Mac with an Xcode installation. These
|
||||
# scripts will work at least as far as 10.5 that we're sure of, but
|
||||
# we build with clang targeting iOS >= 5. We'll accept patches for
|
||||
# older versions of iOS.
|
||||
|
||||
DIST_DIR="ios"
|
||||
FORMAT_EXT=dylib
|
||||
@ -34,13 +31,28 @@ case "$platform" in
|
||||
IOSVER_MINOR=${iosver#*.}
|
||||
IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR}
|
||||
|
||||
# Apple requires this stuff
|
||||
# Tell system clang to build for iOS
|
||||
CC="clang -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
|
||||
CXX="clang++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -miphoneos-version-min=5.0 -isysroot $IOSSDK"
|
||||
|
||||
;;
|
||||
|
||||
theos_ios)
|
||||
DIST_DIR="theos_ios"
|
||||
BUILD_PRODUCT_PREFIX="objs/obj"
|
||||
FORMAT_EXT=dylib
|
||||
IOS=1
|
||||
ARCH=armv7
|
||||
FORMAT=_ios
|
||||
FORMAT_COMPILER_TARGET=theos_ios
|
||||
FORMAT_COMPILER_TARGET_ALT=theos_ios
|
||||
|
||||
# Make sure that the cross bins you need are first in your path
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++ -miphoneos-version-min=5.0"
|
||||
|
||||
;;
|
||||
|
||||
##
|
||||
## Original libretro-config path
|
||||
##
|
||||
@ -105,15 +117,15 @@ B ARM=true
|
||||
FORMAT_COMPILER_TARGET="psp1"
|
||||
DIST_DIR="psp1"
|
||||
;;
|
||||
*wii*)
|
||||
FORMAT_EXT="a"
|
||||
FORMAT_COMPILER_TARGET="wii"
|
||||
DIST_DIR="wii"
|
||||
;;
|
||||
*ios|theos_ios*)
|
||||
*wii*)
|
||||
FORMAT_EXT="a"
|
||||
FORMAT_COMPILER_TARGET="wii"
|
||||
DIST_DIR="wii"
|
||||
;;
|
||||
theos_ios*)
|
||||
FORMAT_EXT="dylib"
|
||||
FORMAT_COMPILER_TARGET="theos_ios"
|
||||
DIST_DIR="theos"
|
||||
DIST_DIR="theos_ios"
|
||||
;;
|
||||
android)
|
||||
FORMAT_EXT="so"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user