Kind of an early POC on new --platform
libretro-super.sh works, but you currently need to set platform and ARCH in your environment before running it as you do with libretro-build.sh now (see libretro-build-ios.sh wrapper for what I mean). The major work left here is the --platform argument and a bunch of little things that will mostly fall into place when that's done. Also need to settle on a license for this. My habit for scripts is public domain, but it could be argued that libretro-super is no longer "a script". Still, I want people to use this if it's useful to them, so I'd prefer a totally unencumbered license in the vein of MIT/BSD/CC-BY. I've tentatively selected CC-BY as a RFC on it vs. MIT, mostly because it tries to explain things in plain language and unlike MIT/BSD is reviewed in the context of (d)evolving international laws to ensure that it still does what is intended.
This commit is contained in:
T. Joseph Carter
parent
5e48b01678
commit
76defbb3a9
|
|
@ -17,14 +17,524 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
shopt -q nullglob || reset_nullglob=1
|
||||
###################################################################
|
||||
#
|
||||
# NEW PLATFORM STUFF
|
||||
# Move to rules files like cores are done
|
||||
#
|
||||
###################################################################
|
||||
|
||||
. "$BASE_DIR/libretro-config.sh"
|
||||
#register_toolchain OSX x86 x86_64
|
||||
toolchain_OSX_CC="cc"
|
||||
toolchain_OSX_CXX="c++"
|
||||
toolchain_OSX_CXX11="clang++"
|
||||
toolchain_OSX_CXX11_args="-std=c++11 -stdlib=libc++"
|
||||
toolchain_OSX_x86_suffix=" -arch i386"
|
||||
toolchain_OSX_x86_64_suffix=" -arch x86_64"
|
||||
toolchain_OSX_platform="osx"
|
||||
|
||||
#register_toolchain iOS armv7 # x86?
|
||||
toolchain_iOS_CC="cc"
|
||||
toolchain_iOS_CXX="c++"
|
||||
toolchain_iOS_CXX11="clang++"
|
||||
toolchain_iOS_CXX11_args="-std=c++11 -stdlib=libc++"
|
||||
toolchain_iOS_armv7_suffix="-arch armv7 -marm -miphoneos-version-min=5.0 -isysroot \$IOSSDK"
|
||||
toolchain_iOS_platform="ios"
|
||||
toolchain_iOS_configure() {
|
||||
if [ -z "$IOSSDK" ]; then
|
||||
if [ -z "${xcodebuild:-$(find_tool xcodebuild)}" ]; then
|
||||
lsecho "You must set IOSSDK or have xcodebuild in your path for iOS"
|
||||
return 1
|
||||
fi
|
||||
export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
|
||||
fi
|
||||
|
||||
if [ ! -d "$IOSSDK/usr" ]; then
|
||||
lsecho "\"$IOSSDK\" does not appear to be a valid iOS SDK."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
###################################################################
|
||||
#
|
||||
# LIBRETRO-CONFIG
|
||||
# Replace with args, rules-based --platform selection, and config
|
||||
# file to save user preferences
|
||||
#
|
||||
# Config file generation will ultimately be something like Linux
|
||||
# kernel menuconfig if you have dialog/whiptail, but those won't
|
||||
# be required.
|
||||
#
|
||||
###################################################################
|
||||
|
||||
# The platform variable is normally not set at the time libretro-config is
|
||||
# included by libretro-build.sh. Other platform scripts may begin to include
|
||||
# libretro-config as well if they define their platform-specific code in the
|
||||
# case block below. This is a band-aid fix that we will address after 1.1 is
|
||||
# released.
|
||||
|
||||
case "$platform" in
|
||||
##
|
||||
## Configs that did not use libretro-config originally
|
||||
## TODO: Integrate this with everything else (post-1.1)
|
||||
##
|
||||
|
||||
ios)
|
||||
# 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
|
||||
IOS=1
|
||||
ARCH=armv7
|
||||
FORMAT=_ios
|
||||
FORMAT_COMPILER_TARGET=ios
|
||||
FORMAT_COMPILER_TARGET_ALT=ios
|
||||
export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
|
||||
iosver=$(xcodebuild -version -sdk iphoneos ProductVersion)
|
||||
IOSVER_MAJOR=${iosver%.*}
|
||||
IOSVER_MINOR=${iosver#*.}
|
||||
IOSVER=${IOSVER_MAJOR}${IOSVER_MINOR}
|
||||
MIN_IOS5="-miphoneos-version-min=5.0"
|
||||
MIN_IOS7="-miphoneos-version-min=7.0"
|
||||
|
||||
# Use generic names rather than gcc/clang to better support both
|
||||
CC="cc -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK"
|
||||
CXX="c++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK"
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -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
|
||||
##
|
||||
*)
|
||||
|
||||
# Architecture Assignment
|
||||
config_cpu() {
|
||||
[ -n "$2" ] && ARCH="$1"
|
||||
[ -z "$ARCH" ] && ARCH="$(uname -m)"
|
||||
case "$ARCH" in
|
||||
x86_64)
|
||||
X86=true
|
||||
X86_64=true
|
||||
;;
|
||||
i386|i686)
|
||||
X86=true
|
||||
;;
|
||||
armv*)
|
||||
ARM=true
|
||||
export FORMAT_COMPILER_TARGET=armv
|
||||
export RARCHCFLAGS="$RARCHCFLAGS -marm"
|
||||
case "${ARCH}" in
|
||||
armv5tel) ARMV5=true ;;
|
||||
armv6l) ARMV6=true ;;
|
||||
armv7l) ARMV7=true ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
if [ -n "$PROCESSOR_ARCHITEW6432" -a "$PROCESSOR_ARCHITEW6432" = "AMD64" ]; then
|
||||
ARCH=x86_64
|
||||
X86=true && X86_64=true
|
||||
fi
|
||||
}
|
||||
|
||||
# Platform Assignment
|
||||
config_platform() {
|
||||
[ -n "$1" ] && platform="$1"
|
||||
[ -z "$platform" ] && platform="$(uname)"
|
||||
case "$platform" in
|
||||
*BSD*)
|
||||
platform=bsd
|
||||
FORMAT_EXT="so"
|
||||
FORMAT_COMPILER_TARGET="unix"
|
||||
DIST_DIR="bsd"
|
||||
;;
|
||||
osx|*Darwin*)
|
||||
platform=osx
|
||||
FORMAT_EXT="dylib"
|
||||
FORMAT_COMPILER_TARGET="osx"
|
||||
DIST_DIR="osx"
|
||||
;;
|
||||
win|*mingw32*|*MINGW32*|*MSYS_NT*)
|
||||
platform=win
|
||||
FORMAT_EXT="dll"
|
||||
FORMAT_COMPILER_TARGET="win"
|
||||
DIST_DIR="win_x86"
|
||||
;;
|
||||
win64|*mingw64*|*MINGW64*)
|
||||
platform=win
|
||||
FORMAT_EXT="dll"
|
||||
FORMAT_COMPILER_TARGET="win"
|
||||
DIST_DIR="win_x64"
|
||||
;;
|
||||
*psp1*)
|
||||
platform=psp1
|
||||
FORMAT_EXT="a"
|
||||
FORMAT_COMPILER_TARGET="psp1"
|
||||
DIST_DIR="psp1"
|
||||
;;
|
||||
*wii*)
|
||||
platform=wii
|
||||
FORMAT_EXT="a"
|
||||
FORMAT_COMPILER_TARGET="wii"
|
||||
DIST_DIR="wii"
|
||||
;;
|
||||
*ngc*)
|
||||
platform=ngc
|
||||
FORMAT_EXT="a"
|
||||
FORMAT_COMPILER_TARGET="ngc"
|
||||
DIST_DIR="ngc"
|
||||
;;
|
||||
theos_ios*)
|
||||
platform=theos_ios
|
||||
FORMAT_EXT="dylib"
|
||||
FORMAT_COMPILER_TARGET="theos_ios"
|
||||
DIST_DIR="theos_ios"
|
||||
;;
|
||||
android)
|
||||
FORMAT_EXT="so"
|
||||
FORMAT_COMPILER_TARGET="android"
|
||||
DIST_DIR="android"
|
||||
;;
|
||||
android-armv7)
|
||||
FORMAT_EXT="so"
|
||||
FORMAT_COMPILER_TARGET="android-armv7"
|
||||
DIST_DIR="android/armeabi-v7a"
|
||||
;;
|
||||
*)
|
||||
FORMAT_EXT="so"
|
||||
FORMAT_COMPILER_TARGET="unix"
|
||||
DIST_DIR="unix"
|
||||
;;
|
||||
esac
|
||||
export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET"
|
||||
}
|
||||
|
||||
config_log_build_host() {
|
||||
echo "PLATFORM: $platform"
|
||||
echo "ARCHITECTURE: $ARCH"
|
||||
echo "TARGET: $FORMAT_COMPILER_TARGET"
|
||||
}
|
||||
|
||||
config_cpu
|
||||
config_platform
|
||||
config_log_build_host
|
||||
|
||||
if [ -z "$JOBS" ]; then
|
||||
# nproc is generally Linux-specific.
|
||||
if command -v nproc >/dev/null; then
|
||||
JOBS="$(nproc)"
|
||||
elif [ "$pltaform" = "osx" ] && command -v sysctl >/dev/null; then
|
||||
JOBS="$(sysctl -n hw.physicalcpu)"
|
||||
else
|
||||
JOBS=1
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Taken from LIBRETRO-BUILD-COMMON.SH
|
||||
[[ "${ARM_NEON}" ]] && echo '=== ARM NEON opts enabled... ===' && export FORMAT_COMPILER_TARGET="$FORMAT_COMPILER_TARGET-neon"
|
||||
[[ "${CORTEX_A8}" ]] && echo '=== Cortex A8 opts enabled... ===' && export FORMAT_COMPILER_TARGET="$FORMAT_COMPILER_TARGET-cortexa8"
|
||||
[[ "${CORTEX_A9}" ]] && echo '=== Cortex A9 opts enabled... ===' && export FORMAT_COMPILER_TARGET="$FORMAT_COMPILER_TARGET-cortexa9"
|
||||
[[ "${ARM_HARDFLOAT}" ]] && echo '=== ARM hardfloat ABI enabled... ===' && export FORMAT_COMPILER_TARGET="$FORMAT_COMPILER_TARGET-hardfloat"
|
||||
[[ "${ARM_SOFTFLOAT}" ]] && echo '=== ARM softfloat ABI enabled... ===' && export FORMAT_COMPILER_TARGET="$FORMAT_COMPILER_TARGET-softfloat"
|
||||
[[ "$X86" ]] && echo '=== x86 CPU detected... ==='
|
||||
[[ "$X86" ]] && [[ "$X86_64" ]] && echo '=== x86_64 CPU detected... ==='
|
||||
|
||||
#if uncommented, will build experimental cores as well which are not yet fit for release.
|
||||
#export BUILD_EXPERIMENTAL=1
|
||||
|
||||
#ARM DEFINES
|
||||
#===========
|
||||
|
||||
#if uncommented, will build cores with Cortex A8 compiler optimizations
|
||||
#export CORTEX_A8=1
|
||||
|
||||
#if uncommented, will build cores with Cortex A9 compiler optimizations
|
||||
#export CORTEX_A9=1
|
||||
|
||||
#if uncommented, will build cores with ARM hardfloat ABI
|
||||
#export ARM_HARDFLOAT=1
|
||||
|
||||
#if uncommented, will build cores with ARM softfloat ABI
|
||||
#export ARM_SOFTFLOAT=1
|
||||
|
||||
#if uncommented, will build cores with ARM NEON support (ARMv7+ only)
|
||||
#export ARM_NEON=1
|
||||
|
||||
#OPENGL DEFINES
|
||||
#==============
|
||||
|
||||
#if uncommented, will build libretro GL cores. Ignored for mobile platforms - GL cores will always be built there.
|
||||
export BUILD_LIBRETRO_GL=1
|
||||
|
||||
#if uncommented, will build cores with OpenGL ES 2 support. Not needed
|
||||
#for platform-specific cores - only for generic core builds (ie. libretro-build.sh)
|
||||
#export ENABLE_GLES=1
|
||||
|
||||
#ANDROID DEFINES
|
||||
#================
|
||||
|
||||
export TARGET_ABIS="armeabi armeabi-v7a x86"
|
||||
|
||||
#uncomment to define NDK standalone toolchain for ARM
|
||||
#export NDK_ROOT_DIR_ARM =
|
||||
|
||||
#uncomment to define NDK standalone toolchain for MIPS
|
||||
#export NDK_ROOT_DIR_MIPS =
|
||||
|
||||
#uncomment to define NDK standalone toolchain for x86
|
||||
#export NDK_ROOT_DIR_X86 =
|
||||
|
||||
# android version target if GLES is in use
|
||||
export NDK_GL_HEADER_VER=android-18
|
||||
|
||||
# android version target if GLES is not in use
|
||||
export NDK_NO_GL_HEADER_VER=android-9
|
||||
|
||||
# Retroarch target android API level
|
||||
export RA_ANDROID_API=android-18
|
||||
|
||||
# Retroarch minimum API level (defines low end android version compatability)
|
||||
export RA_ANDROID_MIN_API=android-9
|
||||
|
||||
#OSX DEFINES
|
||||
#===========
|
||||
|
||||
# Define this to skip the universal build
|
||||
# export NOUNIVERSAL=1
|
||||
|
||||
# ARCHFLAGS is a very convenient way of doing this for simple/obvious cores
|
||||
# that don't need anything defined on the command line for 32 vs 64 bit
|
||||
# systems, however it won't work for anything that does. For that, you need
|
||||
# to do two separate builds, one for each arch, and then do something like:
|
||||
# lipo -create core_i386.dylib core_x86_64.dylib -output core_ub.dylib
|
||||
#
|
||||
# If building on 10.5/10.6, it's possible that you could actually build a UB
|
||||
# for Intel/PowerPC, but please don't. ;) Consider this a proof of concept
|
||||
# for now just to test a few cores.
|
||||
|
||||
if [[ "$FORMAT_COMPILER_TARGET" = "osx" && -z "$NOUNIVERSAL" ]]; then
|
||||
case "$ARCH" in
|
||||
i386|x86_64)
|
||||
export ARCHFLAGS="-arch i386 -arch x86_64"
|
||||
;;
|
||||
ppc|ppc64)
|
||||
export ARCHFLAGS="-arch ppc -arch ppc64"
|
||||
;;
|
||||
*)
|
||||
echo "Will not build universal binaries for unknown ARCH=\"$ARCH\""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# OUTPUT AND LOGGING
|
||||
# ==================
|
||||
#
|
||||
# This is kind of an inline design document that'll be changed for basic user
|
||||
# instructions when the logging system is finished and tested.
|
||||
#
|
||||
# libretro-super has two kinds of output, the basic kind showing what the
|
||||
# script is doing in a big-picture sense, and the commands and output from
|
||||
# individual commands. End-users don't necessarily need to see this more
|
||||
# detailed output, except when we're talking about huge cores like mame.
|
||||
#
|
||||
# If each can be directed to null, to the screen, to a log file, or to both
|
||||
# the screen and a log file, you end up with a matrix os 16 possibilities. Of
|
||||
# those, only a few are truly useful:
|
||||
#
|
||||
# Basic Detailed Useful to
|
||||
# screen screen developer/end-user w/ space issues
|
||||
# screen both developer
|
||||
# both both developer
|
||||
# screen log end-user
|
||||
# log log buildbot
|
||||
#
|
||||
# What this tells me is that we need to log by default, as long as we kill
|
||||
# old logfiles to avoid filling your HD with gigabytes of mame build logs.
|
||||
# Output should go to both screen and log for developers, but users don't need
|
||||
# to see the make commands, etc. Being able to disable both would be useful,
|
||||
# but that a near-term TODO item. That just leaves being able to squelch the
|
||||
# screen output for buildbot usage, and that's just > /dev/null on the command
|
||||
# line, so not our problem here.
|
||||
#
|
||||
# Again, the ability to turn OFF these logs will be wanted very soon.
|
||||
|
||||
# Uncomment this to avoid clobbering logs
|
||||
#LIBRETRO_LOG_APPEND=1
|
||||
|
||||
# Change this to adjust where logs are written
|
||||
#LIBRETRO_LOG_DIR="$WORKDIR/log"
|
||||
|
||||
# Change this to rename the libretro-super main log file
|
||||
#LIBRETRO_LOG_SUPER="libretro-super.log"
|
||||
|
||||
# Change this to rename core log files (%s for core's "safe" name)
|
||||
#LIBRETRO_LOG_CORE="%s.log"
|
||||
|
||||
# Comment this if you don't need to see developer output
|
||||
LIBRETRO_DEVELOPER=1
|
||||
|
||||
|
||||
# COLOR IN OUTPUT
|
||||
# ===============
|
||||
#
|
||||
# If you don't like ANSI-style color in your output, uncomment this line.
|
||||
#NO_COLOR=1
|
||||
|
||||
# If you want to force it even in log files, uncomment this line.
|
||||
#FORCE_COLOR=1
|
||||
|
||||
#USER DEFINES
|
||||
#------------
|
||||
#These options should be defined inside your own
|
||||
#local libretro-config-user.sh file rather than here.
|
||||
#The following below is just a sample.
|
||||
|
||||
if [ -f "$WORKDIR/libretro-config-user.sh" ]; then
|
||||
. "$WORKDIR/libretro-config-user.sh"
|
||||
fi
|
||||
|
||||
###################################################################
|
||||
#
|
||||
# LIBRETRO-BUILD-COMMON
|
||||
# Summary already re-written, CORE_SUFFIX def may be moved
|
||||
# RARCH_DIST_DIR stuff will change with --platform
|
||||
#
|
||||
###################################################################
|
||||
|
||||
CORE_SUFFIX="_libretro${FORMAT}.$FORMAT_EXT"
|
||||
|
||||
summary() {
|
||||
# fmt is external and may not be available
|
||||
fmt_output="$(find_tool "fmt")"
|
||||
local num_success="$(numwords $build_success)"
|
||||
local fmt_success="${fmt_output:+$(echo " $build_success" | $fmt_output)}"
|
||||
local num_fail="$(numwords $build_fail)"
|
||||
local fmt_fail="${fmt_output:+$(echo " $build_fail" | $fmt_output)}"
|
||||
|
||||
if [[ -z "$build_success" && -z "$build_fail" ]]; then
|
||||
lsecho "No build actions performed."
|
||||
return
|
||||
fi
|
||||
|
||||
if [ -n "$build_success" ]; then
|
||||
secho "$(color 32)$num_success module(s)$(color) compiled successfully:"
|
||||
lecho "$num_success module(s) successfully processed:"
|
||||
lsecho "$fmt_success"
|
||||
fi
|
||||
if [ -n "$build_fail" ]; then
|
||||
secho "$(color 31)$num_fail module(s)$(color) failed to compile:"
|
||||
lecho "$num_fail module(s) failed:"
|
||||
lsecho "$fmt_fail"
|
||||
fi
|
||||
}
|
||||
|
||||
create_dist_dir() {
|
||||
mkdir -p "$RARCH_DIST_DIR"
|
||||
}
|
||||
|
||||
if [ -z "$RARCH_DIST_DIR" ]; then
|
||||
RARCH_DIR="$WORKDIR/dist"
|
||||
RARCH_DIST_DIR="$RARCH_DIR/$DIST_DIR"
|
||||
fi
|
||||
create_dist_dir
|
||||
|
||||
###################################################################
|
||||
#
|
||||
# LIBRETRO-BUILD-COMMON
|
||||
# Default tool selection goes into --platform stuff
|
||||
#
|
||||
###################################################################
|
||||
|
||||
if [ -z "$JOBS" ]; then
|
||||
JOBS=7
|
||||
fi
|
||||
|
||||
if [ "$HOST_CC" ]; then
|
||||
CC="${HOST_CC}-gcc"
|
||||
CXX="${HOST_CC}-g++"
|
||||
CXX11="${HOST_CC}-g++"
|
||||
STRIP="${HOST_CC}-strip"
|
||||
fi
|
||||
|
||||
|
||||
if [ -z "$MAKE" ]; then
|
||||
if uname -s | grep -i MINGW > /dev/null 2>&1; then
|
||||
MAKE=mingw32-make
|
||||
else
|
||||
if type gmake > /dev/null 2>&1; then
|
||||
MAKE=gmake
|
||||
else
|
||||
MAKE=make
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$CC" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CC=cc
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CC=mingw32-gcc
|
||||
else
|
||||
CC=gcc
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$CXX" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CXX=c++
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++"
|
||||
# FIXME: Do this right later.
|
||||
if [ "$ARCH" = "i386" ]; then
|
||||
CC="cc -arch i386"
|
||||
CXX="c++ -arch i386"
|
||||
CXX11="clang++ -arch i386 -std=c++11 -stdlib=libc++"
|
||||
fi
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CXX=mingw32-g++
|
||||
CXX11=mingw32-g++
|
||||
else
|
||||
CXX=g++
|
||||
CXX11=g++
|
||||
fi
|
||||
fi
|
||||
|
||||
FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET
|
||||
|
||||
|
||||
###################################################################
|
||||
#
|
||||
# END OF INSERTED OLD SCRIPT BITS
|
||||
#
|
||||
###################################################################
|
||||
|
||||
shopt -q nullglob || reset_nullglob=1
|
||||
|
||||
. "$BASE_DIR/script-modules/log.sh"
|
||||
. "$BASE_DIR/script-modules/util.sh"
|
||||
. "$BASE_DIR/script-modules/fetch-rules.sh"
|
||||
. "$BASE_DIR/script-modules/modules.sh"
|
||||
. "$BASE_DIR/script-modules/cpu.sh"
|
||||
|
||||
# Read all of the rules file
|
||||
shopt -s nullglob
|
||||
|
|
@ -65,9 +575,12 @@ if [ -n "$1" ]; then
|
|||
;;
|
||||
|
||||
#
|
||||
# Scope controls
|
||||
# Configuration controls
|
||||
#
|
||||
|
||||
# TODO
|
||||
--config|--configure) ;;
|
||||
|
||||
--devel) LIBRETRO_DEVELOPER=1 ;;
|
||||
--no-devel) LIBRETRO_DEVELOPER="" ;;
|
||||
|
||||
|
|
@ -103,6 +616,18 @@ if [ -n "$1" ]; then
|
|||
actions="$actions package"
|
||||
;;
|
||||
|
||||
|
||||
#
|
||||
# Platform controls
|
||||
#
|
||||
|
||||
--platform)
|
||||
if [ -n "$2" ]; then
|
||||
build_platforms="$build_platforms $2"
|
||||
shift
|
||||
fi
|
||||
;;
|
||||
|
||||
#
|
||||
# Module type controls
|
||||
#
|
||||
|
|
@ -145,7 +670,7 @@ letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA."
|
|||
exit 0
|
||||
fi
|
||||
lsecho "Licensed under CC-BY-4.0 (--license for details)"
|
||||
|
||||
# XXX: MIT vs CC-BY vs CC-0?
|
||||
|
||||
# Configure some defaults
|
||||
[ -z "$actions" ] && actions="$default_actions"
|
||||
|
|
@ -172,9 +697,13 @@ fi
|
|||
###################################################################
|
||||
#
|
||||
# MODULE PROCESSING
|
||||
# To be moved out of main script
|
||||
#
|
||||
###################################################################
|
||||
|
||||
|
||||
# All of the module_* vars are set here before calling any other module
|
||||
# processing actions
|
||||
module_set_vars() {
|
||||
module_varname="$1"
|
||||
eval "module_name=\${libretro_${1}_name:-$1}"
|
||||
|
|
@ -228,6 +757,9 @@ module_set_vars() {
|
|||
|
||||
eval "module_build_cores=\${libretro_${1}_build_cores:-$1}"
|
||||
eval "module_build_products=\$libretro_${1}_build_products"
|
||||
|
||||
# TODO: this too...
|
||||
eval "module_build_compiler=\$libretro_${1}_build_compiler"
|
||||
;;
|
||||
|
||||
legacy)
|
||||
|
|
@ -324,7 +856,13 @@ module_compile() {
|
|||
|
||||
[ -n "$JOBS" ] && make_cmdline="$make_cmdline -j$JOBS"
|
||||
|
||||
make_cmdline="$make_cmdline $COMPILER"
|
||||
# TODO: Do this better too (only affects a few cores)
|
||||
if [ -n "$module_build_compiler" ]; then
|
||||
make_cmdline="$make_cmdline $module_build_compiler"
|
||||
else
|
||||
make_cmdline="$make_cmdline ${CC:+CC="$CC"} ${CXX:+CXX="$CXX"}"
|
||||
fi
|
||||
|
||||
if [ -n "$module_build_makefile_targets" ]; then
|
||||
for target in $module_build_makefile_targets; do
|
||||
echo_cmd "$make_cmdline $module_build_args $target"
|
||||
|
|
@ -333,9 +871,7 @@ module_compile() {
|
|||
echo_cmd "$make_cmdline $module_build_args"
|
||||
fi
|
||||
if [ $? -gt 0 ]; then
|
||||
for core in $module_build_cores; do
|
||||
build_summary_log 1 $core
|
||||
done
|
||||
build_fail="$build_fail$module_build_cores "
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
|
@ -344,11 +880,11 @@ module_compile() {
|
|||
module_src="${module_build_products:+$module_build_products/}$module$CORE_SUFFIX"
|
||||
module_dest="$module$CORE_SUFFIX"
|
||||
if [ -f "$module_src" ]; then
|
||||
build_summary_log 0 $module
|
||||
build_success="$build_success$module "
|
||||
echo_cmd "cp \"$module_src\" \"$RARCH_DIST_DIR/$module_dest\""
|
||||
modules_copied="$modules_copied $module_dest"
|
||||
else
|
||||
build_summary_log 1 $module
|
||||
build_fail="$build_fail$module "
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
|
|
@ -378,8 +914,8 @@ module_package() {
|
|||
if [ -n "$modules_copied" ]; then
|
||||
lsecho "Packaging ${module_varname}..."
|
||||
cd "$RARCH_DIST_DIR"
|
||||
# TODO: Packaging other than zip (deb, etc?)
|
||||
for module in $modules_copied; do
|
||||
# TODO: Support more than zip here
|
||||
zip -m9 "${module}.zip" $module
|
||||
done
|
||||
fi
|
||||
|
|
@ -459,74 +995,12 @@ module_process() {
|
|||
log_module_stop
|
||||
}
|
||||
|
||||
#################################
|
||||
# Borrowed from original libretro-build
|
||||
# TODO: Replace this code using find_tool
|
||||
|
||||
if [ -z "$RARCH_DIST_DIR" ]; then
|
||||
RARCH_DIR="$WORKDIR/dist"
|
||||
RARCH_DIST_DIR="$RARCH_DIR/$DIST_DIR"
|
||||
fi
|
||||
|
||||
if [ -z "$JOBS" ]; then
|
||||
JOBS=7
|
||||
fi
|
||||
|
||||
if [ "$HOST_CC" ]; then
|
||||
CC="${HOST_CC}-gcc"
|
||||
CXX="${HOST_CC}-g++"
|
||||
CXX11="${HOST_CC}-g++"
|
||||
STRIP="${HOST_CC}-strip"
|
||||
fi
|
||||
|
||||
|
||||
if [ -z "$MAKE" ]; then
|
||||
if uname -s | grep -i MINGW > /dev/null 2>&1; then
|
||||
MAKE=mingw32-make
|
||||
else
|
||||
if type gmake > /dev/null 2>&1; then
|
||||
MAKE=gmake
|
||||
else
|
||||
MAKE=make
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$CC" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CC=cc
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CC=mingw32-gcc
|
||||
else
|
||||
CC=gcc
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$CXX" ]; then
|
||||
if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
|
||||
CXX=c++
|
||||
CXX11="clang++ -std=c++11 -stdlib=libc++"
|
||||
# FIXME: Do this right later.
|
||||
if [ "$ARCH" = "i386" ]; then
|
||||
CC="cc -arch i386"
|
||||
CXX="c++ -arch i386"
|
||||
CXX11="clang++ -arch i386 -std=c++11 -stdlib=libc++"
|
||||
fi
|
||||
elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
|
||||
CXX=mingw32-g++
|
||||
CXX11=mingw32-g++
|
||||
else
|
||||
CXX=g++
|
||||
CXX11=g++
|
||||
fi
|
||||
fi
|
||||
|
||||
FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET
|
||||
|
||||
. "$BASE_DIR/libretro-build-common.sh"
|
||||
|
||||
# End of borrowed code
|
||||
#################################
|
||||
###################################################################
|
||||
#
|
||||
# DO STUFF
|
||||
# The bit of this script that actually does all the work is here
|
||||
#
|
||||
###################################################################
|
||||
|
||||
for target in $process; do
|
||||
module_process $target
|
||||
|
|
|
|||
Loading…
Reference in New Issue