From c372699fc7b4de90eb044314ce5bed04db640291 Mon Sep 17 00:00:00 2001
From: mtheall <pigman46@gmail.com>
Date: Tue, 25 Sep 2012 20:50:04 -0500
Subject: [PATCH] fix some buildscript problems

---
 README.TXT                        |  3 ++-
 build-devkit.sh                   |  2 +-
 dkarm-eabi/scripts/build-crtls.sh | 14 +++++++++-----
 select_toolchain.sh               | 14 +++++++++++++-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/README.TXT b/README.TXT
index 13a7590..87eb43d 100644
--- a/README.TXT
+++ b/README.TXT
@@ -25,10 +25,11 @@ http://gmplib.org/
 http://www.mpfr.org/
 http://www.multiprecision.org/
 
-Some of the tools for devkitARM and devkitPPC also require FreeImage and zlib
+Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib, and libusb
 
 http://freeimage.sourceforge.net/
 http://www.zlib.net
+http://www.libusb.org
  
 Downloading the source packages
 -------------------------------
diff --git a/build-devkit.sh b/build-devkit.sh
index 599a660..c6382ea 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -197,7 +197,7 @@ archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLI
 if [ $VERSION -eq 1 ]; then
 	targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
 		libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
-		default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
+		default_arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
 		libfat-src-${LIBFAT_VER}.tar.bz2"
 	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
 		general-tools-$GENERAL_TOOLS_VER.tar.bz2 dlditool-$DLDITOOL_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
diff --git a/dkarm-eabi/scripts/build-crtls.sh b/dkarm-eabi/scripts/build-crtls.sh
index 36eb928..8077a8e 100644
--- a/dkarm-eabi/scripts/build-crtls.sh
+++ b/dkarm-eabi/scripts/build-crtls.sh
@@ -22,6 +22,10 @@ $MAKE CRT=ds_arm7
 $MAKE CRT=ds_arm9
 $MAKE CRT=ds_cart
 
+cd $BUILDDIR/libgba-$LIBGBA_VER
+$MAKE || { echo "error building libgba"; exit 1; }
+$MAKE install || { echo "error installing libgba"; exit 1; }
+
 cd $BUILDDIR/libnds-$LIBNDS_VER
 $MAKE || { echo "error building libnds"; exit 1; }
 $MAKE install || { echo "error installing libnds"; exit 1; }
@@ -30,7 +34,11 @@ cd $BUILDDIR/dswifi-$DSWIFI_VER
 $MAKE || { echo "error building dswifi"; exit 1; }
 $MAKE install || { echo "error installing dswifi"; exit 1; }
 
-cd $BUILDDIR/default-arm7-$DEFAULT_ARM7_VER
+cd $BUILDDIR/maxmod-$MAXMOD_VER
+$MAKE || { echo "error building maxmod"; exit 1; }
+$MAKE install || { echo "error installing maxmod"; exit 1; }
+
+cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
 $MAKE || { echo "error building default arm7"; exit 1; }
 $MAKE install || { echo "error installing default arm7"; exit 1; }
 
@@ -38,10 +46,6 @@ cd $BUILDDIR/libfat-$LIBFAT_VER
 $MAKE nds-install || { echo "error building nds libfat"; exit 1; }
 $MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
 
-cd $BUILDDIR/maxmod-$MAXMOD_VER
-$MAKE || { echo "error building maxmod"; exit 1; }
-$MAKE install || { echo "error installing maxmod"; exit 1; }
-
 cd $BUILDDIR/libmirko-$LIBMIRKO_VER
 $MAKE || { echo "error building libmirko"; exit 1; }
 $MAKE install || { echo "error installing libmirko"; exit 1; }
diff --git a/select_toolchain.sh b/select_toolchain.sh
index 8ae289f..9a29cab 100644
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -1,5 +1,17 @@
 #!/bin/bash
 VERSION=0
+case "$BUILD_DKPRO_PACKAGE" in
+  "1" )
+    VERSION=1
+  ;;
+  "2" )
+    VERSION=2
+  ;;
+  "3" )
+    VERSION=3
+  ;;
+esac
+
 while [ $VERSION -eq 0 ]
 do
   echo
@@ -47,4 +59,4 @@ case "$VERSION" in
     target=psp
     toolchain=DEVKITPSP
   ;;
-esac
\ No newline at end of file
+esac