Skip to content

Commit

Permalink
Added Mame4All-Pi, added new log functionality, fixed default flags f…
Browse files Browse the repository at this point in the history 
…or "as", fixed default ES-settings for Mupen64plus-rpi
  • Loading branch information
@petrockblog
petrockblog committed Nov 5, 2013
1 parent 56b27f6 commit 9706108
Show file tree
Hide file tree
Showing 7 changed files with 281 additions and 231 deletions.
23 changes: 20 additions & 3 deletions retropie_setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ __INFMSGS=""
__doReboot=0

__default_cflags="-O2 -pipe -mfpu=vfp -march=armv6j -mfloat-abi=hard"
__default_asflags=""

[[ -z "${CFLAGS}" ]] && export CFLAGS="${__default_cflags}"
[[ -z "${CXXFLAGS}" ]] && export CXXFLAGS="${__default_cflags}"
[[ -z "${ASFLAGS}" ]] && export ASFLAGS="${__default_cflags}"
[[ -z "${ASFLAGS}" ]] && export ASFLAGS="${__default_asflags}"

# HELPER FUNCTIONS ###

Expand Down Expand Up @@ -199,12 +200,22 @@ if [[ ! -d $rootdir ]]; then
fi
fi

if [[ ! -d $scriptdir/logs ]]; then
mkdir -p "$scriptdir/logs"
chown $user "$scriptdir/logs"
chgrp $user "$scriptdir/logs"
if [[ ! -d $scriptdir/logs ]]; then
echo "Couldn't make directory $scriptdir/logs"
exit 1
fi
fi

rps_availFreeDiskSpace 800000

while true; do
cmd=(dialog --backtitle "PetRockBlock.com - RetroPie Setup. Installation folder: $rootdir for user $user" --menu "Choose installation either based on binaries or on sources." 22 76 16)
options=(1 "Binaries-based INSTALLATION (faster, but possibly not up-to-date)"
2 "Source-based INSTALLATION (slower, but up-to-date versions)"
2 "Source-based INSTALLATION (16-20 hours (!), but up-to-date versions)"
3 "SETUP (only if you already have run one of the installations above)"
4 "UPDATE RetroPie Setup script"
5 "UPDATE RetroPie Binaries"
Expand All @@ -213,7 +224,13 @@ while true; do
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
if [ "$choices" != "" ]; then
case $choices in
1) rps_main_binaries ;;
1) now=$(date +'%d%m%Y_%H%M%S')
{
rps_main_binaries
} 2>&1 | tee >(gzip --stdout > $scriptdir/logs/run_$now.log.gz)
chown -R $user $scriptdir/logs/run_$now.log.gz
chgrp -R $user $scriptdir/logs/run_$now.log.gz
;;
2) rps_main_options ;;
3) rps_main_setup ;;
4) rps_main_updatescript ;;
Expand Down
11 changes: 10 additions & 1 deletion scriptmodules/emulators.shinc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,15 @@ function em_install_hatari()
apt-get install -y hatari
}

function em_install_mame4allpi()
{
printMsg "Installing Mame4All-Pi"

gitPullOrClone "$rootdir/emulators/mame4all-pi" https://code.google.com/p/mame4all-pi/
make
popd
}

# install Sega Mega Drive/Mastersystem/Game Gear emulator OsmOse
function em_install_megadrive()
{
Expand Down Expand Up @@ -676,7 +685,7 @@ function em_install_retroarch()
make
make install
cp $scriptdir/supplementary/retroarch-zip "$rootdir/emulators/RetroArch/"
if [[ ! -f "/usr/local/bin/retroarch" ]]; then
if [[ ! -f "$rootdir/emulators/RetroArch/installdir/bin/retroarch" ]]; then
__ERRMSGS="$__ERRMSGS Could not successfully compile and install RetroArch."
fi
popd
Expand Down
42 changes: 25 additions & 17 deletions scriptmodules/raspbianconfig.shinc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,23 +146,31 @@ function rc_installAPTPackages()
# remove all packages that are installed by the RetroPie Setup Script
function rc_removeAPTPackages()
{
printMsg "Making sure that all packages that are installed by the script are removed."
apt-get remove -y libsdl1.2-dev screen scons libasound2-dev pkg-config libgtk2.0-dev \
libboost-filesystem-dev libboost-system-dev zip python-imaging \
libfreeimage-dev libfreetype6-dev libxml2 libxml2-dev libbz2-dev \
libaudiofile-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev \
joystick fbi gcc-4.7 automake1.4 libcurl4-openssl-dev libzip-dev \
build-essential nasm libgl1-mesa-dev libglu1-mesa-dev \
libvorbis-dev libpng12-dev libvpx-dev freepats subversion \
libboost-serialization-dev libboost-thread-dev libsdl-ttf2.0-dev \
cmake g++-4.7 unrar-free p7zip p7zip-full libeigen3-dev bluez-utils \
bluez-compat bluez-hcidump checkinstall libusb-dev libbluetooth-dev \
mplayer
# libgles2-mesa-dev

apt-get -y autoremove

dialog --backtitle "PetRockBlock.com - RetroPie Setup. Installation folder: $rootdir for user $user" --msgbox "Successfully removed APT packages. For a complete uninstall you need to delete the 'RetroPie' folder on your own." 22 76
dialog --title " UNINSTALL RetroPie installation " --clear \
--yesno "Do you really want to UNINSTALL RetroPie? WARNING: The RetroPie folder will be DELETED!" 22 76

case $? in
0)
printMsg "Making sure that all packages that are installed by the script are removed."
apt-get remove -y libsdl1.2-dev screen scons libasound2-dev pkg-config libgtk2.0-dev \
libboost-filesystem-dev libboost-system-dev zip python-imaging \
libfreeimage-dev libfreetype6-dev libxml2 libxml2-dev libbz2-dev \
libaudiofile-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev \
joystick fbi gcc-4.7 automake1.4 libcurl4-openssl-dev libzip-dev \
build-essential nasm libgl1-mesa-dev libglu1-mesa-dev \
libvorbis-dev libpng12-dev libvpx-dev freepats subversion \
libboost-serialization-dev libboost-thread-dev libsdl-ttf2.0-dev \
cmake g++-4.7 unrar-free p7zip p7zip-full libeigen3-dev bluez-utils \
bluez-compat bluez-hcidump checkinstall libusb-dev libbluetooth-dev \
mplayer
# libgles2-mesa-dev
apt-get -y autoremove
rm -rf $rootdir
dialog --backtitle "PetRockBlock.com - RetroPie Setup. Installation folder: $rootdir for user $user" --msgbox "Successfully removed APT packages and the RetroPie folder." 22 76
;;
*)
;;
esac
}

# fix for RaspBMC
Expand Down
Loading

0 comments on commit 9706108

Please sign in to comment.