diff --git a/common.sh b/common.sh
index 2794b02..c8c855f 100644
--- a/common.sh
+++ b/common.sh
@@ -54,6 +54,14 @@ function download_and_extract {
             test_deps tar
             tar xjf $name
             ;;
+        "tbz2")
+            test_deps tar
+            tar xjf $name
+            ;;
+        "zip")
+            test_deps unzip
+            unzip $name
+            ;;
         *)
             echo "Archive extension $ext unsupported."
             return 1
@@ -89,7 +97,7 @@ function get_pspports {
 
 # Usage: run_configure OPT1 OPT2 ...
 function run_configure {
-    LDFLAGS="$LDFLAGS -L$(psp-config --pspsdk-path)/lib -lc -lpspuser" \
+    LDFLAGS="$LDFLAGS -L$(psp-config --pspsdk-path)/lib -L$(psp-config --psp-prefix)/lib -lc -lpspuser" \
     LIBS="$LIBS -lc -lpspuser" \
     ./configure --host=psp --prefix=$(psp-config --psp-prefix) $* || { return 1; }
     return 0
diff --git a/depends/check-angelscript.sh b/depends/check-angelscript.sh
new file mode 100755
index 0000000..7e2435a
--- /dev/null
+++ b/depends/check-angelscript.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PREFIX=$(psp-config --psp-prefix)
+
+ls $PREFIX/lib/libAngelscript.a $PREFIX/include/angelscript.h
diff --git a/depends/check-cmake-toolchain-script.sh b/depends/check-cmake-toolchain-script.sh
new file mode 100755
index 0000000..fe7467a
--- /dev/null
+++ b/depends/check-cmake-toolchain-script.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# check-cmake-toolchain-script.sh by Takeshi Watanabe (takechi101010@gmail.com)
+
+ ## Check for cmake toolchain script.
+ ls \
+     $(psp-config --pspdev-path)/bin/psp-cmake \
+     $(psp-config --psp-prefix)/share/cmake-2.8/Modules/Platform/PSP.cmake
diff --git a/depends/check-cmake.sh b/depends/check-cmake.sh
new file mode 100755
index 0000000..3048a7d
--- /dev/null
+++ b/depends/check-cmake.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# check-cmake.sh by Takeshi Watanabe (takechi101010@gmail.com)
+
+ ## Check for cmake.
+ cmake --version
diff --git a/depends/check-openal.sh b/depends/check-openal.sh
new file mode 100755
index 0000000..3bb9664
--- /dev/null
+++ b/depends/check-openal.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ PREFIX=$(psp-config --psp-prefix)
+
+ ls $PREFIX/lib/libopenal.a $PREFIX/include/AL/al.h $PREFIX/include/AL/alc.h
diff --git a/depends/check-opentri.sh b/depends/check-opentri.sh
new file mode 100755
index 0000000..3274217
--- /dev/null
+++ b/depends/check-opentri.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ PREFIX=$(psp-config --psp-prefix)
+
+ ls $PREFIX/lib/libtri.a $PREFIX/include/openTri $PREFIX/share/doc/openTri
diff --git a/depends/check-smpeg-psp.sh b/depends/check-smpeg-psp.sh
new file mode 100755
index 0000000..5e10ed6
--- /dev/null
+++ b/depends/check-smpeg-psp.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ ls $(psp-config --psp-prefix)/lib/libsmpeg.a $(psp-config --psp-prefix)/include/smpeg.h
diff --git a/depends/check-squirrel.sh b/depends/check-squirrel.sh
new file mode 100755
index 0000000..1c89c43
--- /dev/null
+++ b/depends/check-squirrel.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ PREFIX=$(psp-config --psp-prefix)
+
+ ls $PREFIX/lib/libsquirrel.a $PREFIX/lib/libsqstdlib.a $PREFIX/include/squirrel.h
diff --git a/depends/check-unzip.sh b/depends/check-unzip.sh
new file mode 100755
index 0000000..c7bb073
--- /dev/null
+++ b/depends/check-unzip.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# check-unzip.sh by take_cheeze (takechi101010@gmail.com)
+
+ ## Check for tar.
+ unzip -v
diff --git a/libraries.sh b/libraries.sh
index 43e6308..afe27ca 100755
--- a/libraries.sh
+++ b/libraries.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
 
+ ## remove $CC and $CXX for configure
+ unset CC
+ unset CXX
+
+ ## Enter the psplibraries directory.
  cd "`dirname $0`" || { echo "ERROR: Could not enter the psplibraries directory."; exit 1; }
 
  source common.sh
  basepath=$PWD
  mkdir -p build || { echo "ERROR: Could not create the build directory."; exit 1; }
- test_deps psptoolchain
+ test_deps psptoolchain libtool
 
  # If specific steps were requested, run the requested build scripts.
  if [ $1 ]; then
@@ -24,7 +29,7 @@
      if [ $? -ne 0 ] || [ $buildall -eq 0 ]; then
          if [ -x $f ]; then
              cd $basepath/build
-             sh -c "source ../common.sh; \
+             bash -c "source ../common.sh; \
              set -e; \
              basepath=$basepath; \
              source $f" || { echo "Failed installing $step!"; faillist="$faillist $step"; }
diff --git a/patches/PSP.cmake b/patches/PSP.cmake
new file mode 100644
index 0000000..56666b5
--- /dev/null
+++ b/patches/PSP.cmake
@@ -0,0 +1,40 @@
+SET(CMAKE_SYSTEM_NAME Generic)
+SET(CMAKE_SYSTEM_VERSION 1)
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+# set compiler
+INCLUDE(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(psp-gcc GNU)
+CMAKE_FORCE_CXX_COMPILER(psp-g++ GNU)
+
+SET(BUILD_SHARED_LIBS FALSE)
+SET(CMAKE_EXECUTABLE_SUFFIX ".elf")
+
+# set find root path
+SET(CMAKE_FIND_ROOT_PATH "")
+FOREACH(i "--pspsdk-path" "--psp-prefix" "--pspdev-path")
+  EXECUTE_PROCESS(
+	COMMAND "psp-config" ${i}
+	OUTPUT_VARIABLE output
+	OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  LIST(APPEND CMAKE_FIND_ROOT_PATH "${output}")
+  INCLUDE_DIRECTORIES(SYSTEM "${output}/include")
+  LINK_DIRECTORIES("${output}/lib")
+ENDFOREACH()
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# set install path
+EXECUTE_PROCESS(
+  COMMAND "psp-config" "--psp-prefix"
+  OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# reduce link error
+ADD_DEFINITIONS("-G0")
+
+# linker flags
+LINK_LIBRARIES("-lpthread-psp -lc -lpspuser -lpspsdk -flto")
diff --git a/patches/psp-cmake b/patches/psp-cmake
new file mode 100755
index 0000000..49573f1
--- /dev/null
+++ b/patches/psp-cmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+MODULE_PATH=$(psp-config --psp-prefix)/share/cmake-2.8/Modules
+
+
+cmake \
+	-D CMAKE_MODULE_PATH=$MODULE_PATH \
+	-D CMAKE_TOOLCHAIN_FILE=$MODULE_PATH/Platform/PSP.cmake \
+	$@
diff --git a/patches/squirrel-3.0.2.patch b/patches/squirrel-3.0.2.patch
new file mode 100644
index 0000000..fb9777a
--- /dev/null
+++ b/patches/squirrel-3.0.2.patch
@@ -0,0 +1,110 @@
+diff --git a/sq/Makefile b/sq/Makefile
+index 911a16b..81c2561 100755
+--- a/sq/Makefile
++++ b/sq/Makefile
+@@ -1,21 +1,21 @@
+-SQUIRREL= ..
+-
+-
+-OUT= $(SQUIRREL)/bin/sq
+-INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
+-LIBZ= -L$(SQUIRREL)/lib 
+-LIB= -lsquirrel -lsqstdlib
+-
+-OBJS= sq.o
+-	
+-SRCS= sq.c
+-	
+-	
+-sq32:
+-	g++ -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+-
+-sqprof:
+-	g++ -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+-	
+-sq64:
+-	g++ -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++SQUIRREL= ..
++
++
++OUT= $(SQUIRREL)/bin/sq
++INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
++LIBZ= -L$(SQUIRREL)/lib -L$(shell psp-config --psp-prefix)/lib -L$(shell psp-config --pspsdk-path)/lib
++LIB= -lsquirrel -lsqstdlib -lc -lpspuser
++
++OBJS= sq.o
++	
++SRCS= sq.c
++	
++	
++sq32:
++	$(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++
++sqprof:
++	$(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++	
++sq64:
++	$(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+diff --git a/sqstdlib/Makefile b/sqstdlib/Makefile
+index 10f6384..39b075e 100755
+--- a/sqstdlib/Makefile
++++ b/sqstdlib/Makefile
+@@ -2,7 +2,7 @@ SQUIRREL= ..
+ 
+ 
+ OUT= $(SQUIRREL)/lib/libsqstdlib.a
+-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
++INCZ= -I$(SQUIRREL)/include -I. -Iinclude -L$(shell psp-config --psp-prefix)/lib -L$(shell psp-config --pspsdk-path)/lib -lc -lpspuser
+ 
+ OBJS= \
+ 	sqstdblob.o \
+@@ -26,16 +26,16 @@ SRCS= \
+ 	
+ 	
+ sq32:
+-	gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
+ 
+ sqprof:
+-	gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
+ 	
+ sq64:
+-	gcc -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
+diff --git a/squirrel/Makefile b/squirrel/Makefile
+index d5de81a..8575794 100755
+--- a/squirrel/Makefile
++++ b/squirrel/Makefile
+@@ -37,16 +37,16 @@ SRCS= \
+ 	
+ 	
+ sq32:
+-	gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
+ 
+ sqprof:
+-	gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
+ 
+ sq64:
+-	gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+-	ar rc $(OUT) *.o
++	${CC} -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++	${AR} rc $(OUT) *.o
+ 	rm *.o
diff --git a/readme-ubuntu.txt b/readme-ubuntu.txt
index bfcbf13..61ed98e 100644
--- a/readme-ubuntu.txt
+++ b/readme-ubuntu.txt
@@ -1,6 +1,6 @@
  ## Install psptoolchain
  ## Install the required packages.
- sudo apt-get install libtool tcl doxygen ruby
+ sudo apt-get install libtool tcl doxygen cmake unzip
 
  ## Build and install the libraries.
  sudo ./libraries-sudo.sh
diff --git a/readme.txt b/readme.txt
index a7c748c..70e77fe 100644
--- a/readme.txt
+++ b/readme.txt
@@ -12,7 +12,7 @@
 
  1) Set up your environment by installing the following software:
 
-  autoconf, automake, libtool, make, psptoolchain, subversion, wget, doxygen, ruby
+  autoconf, automake, libtool, make, psptoolchain, subversion, wget, doxygen, unzip
 
  2) Run the library script:
 
diff --git a/scripts/SDL_gfx.sh b/scripts/SDL_gfx.sh
index f567d66..d07b9a5 100755
--- a/scripts/SDL_gfx.sh
+++ b/scripts/SDL_gfx.sh
@@ -1,4 +1,4 @@
-test_deps SDL
+test_deps_install SDL
 download_and_extract http://sourceforge.net/projects/sdlgfx/files/SDL_gfx-2.0.23.tar.gz SDL_gfx-2.0.23
 apply_patch SDL_gfx-2.0.23-PSP
 AR=psp-ar run_autogen_build --with-sdl-prefix=$(psp-config --psp-prefix) --disable-mmx --disable-shared
diff --git a/scripts/SDL_image.sh b/scripts/SDL_image.sh
index 7fc0e96..baa77dc 100755
--- a/scripts/SDL_image.sh
+++ b/scripts/SDL_image.sh
@@ -1,4 +1,5 @@
-test_deps SDL
+test_deps_install SDL libpng jpeg
+
 download_and_extract http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.10.tar.gz SDL_image-1.2.10
 apply_patch SDL_image-1.2.10-PSP
 LDFLAGS="-lpspirkeyb" run_autogen_build --with-sdl-prefix=$(psp-config --psp-prefix)
diff --git a/scripts/SDL_mixer.sh b/scripts/SDL_mixer.sh
index 9eb7ff8..e94f0d7 100755
--- a/scripts/SDL_mixer.sh
+++ b/scripts/SDL_mixer.sh
@@ -1,4 +1,4 @@
-test_deps SDL libmikmod
+test_deps_install SDL libmikmod
 download_and_extract http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.11.tar.gz SDL_mixer-1.2.11
 apply_patch SDL_mixer-1.2.11-PSP
 run_autogen_build --with-sdl-prefix=$(psp-config --psp-prefix) --enable-music-mod --disable-music-mp3
diff --git a/scripts/SDL_ttf.sh b/scripts/SDL_ttf.sh
index c899dde..58f4aed 100755
--- a/scripts/SDL_ttf.sh
+++ b/scripts/SDL_ttf.sh
@@ -1,4 +1,4 @@
-test_deps SDL freetype
+test_deps_install SDL freetype
 download_and_extract http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.10.tar.gz SDL_ttf-2.0.10
 apply_patch SDL_ttf-2.0.10-PSP
 run_autogen_build --with-sdl-prefix=$(psp-config --psp-prefix) --with-freetype=$(psp-config --psp-prefix) --without-x
diff --git a/scripts/angelscript.sh b/scripts/angelscript.sh
new file mode 100755
index 0000000..af65ad7
--- /dev/null
+++ b/scripts/angelscript.sh
@@ -0,0 +1,15 @@
+## test dependency
+test_deps_install cmake-toolchain-script
+
+ANGELSCRIPT_VERSION=2.23.0
+
+download_and_extract http://www.angelcode.com/angelscript/sdk/files/angelscript_$ANGELSCRIPT_VERSION.zip sdk
+cd angelscript/projects/cmake || { return 1; }
+
+## Run cmake
+psp-cmake -D CMAKE_INSTALL_PREFIX=$(psp-config --psp-prefix) . || { exit 1; }
+
+## Compile and Install
+make -j 4 || { exit 1; }
+cp -v ../../include/*.h $(psp-config --psp-prefix)/include
+cp -v ../../lib/lib*.a $(psp-config --psp-prefix)/lib
diff --git a/scripts/cmake-toolchain-script.sh b/scripts/cmake-toolchain-script.sh
new file mode 100755
index 0000000..ce3eb80
--- /dev/null
+++ b/scripts/cmake-toolchain-script.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# cmake-toolchain-script.sh by take_cheeze (takechi101010@gmail.com)
+
+PSP_CMAKE_PATH=$(psp-config --pspdev-path)/bin/psp-cmake
+TOOLCHAIN_SCRIPT_PATH=$(psp-config --psp-prefix)/share/cmake-2.8/Modules/Platform
+
+## copy toolchain script and psp-cmake
+mkdir -p $TOOLCHAIN_SCRIPT_PATH
+cp ../patches/PSP.cmake $TOOLCHAIN_SCRIPT_PATH || { exit 1; }
+cp ../patches/psp-cmake $PSP_CMAKE_PATH || { exit 1; }
diff --git a/scripts/expat.sh b/scripts/expat.sh
index c9da923..8f0e8dd 100755
--- a/scripts/expat.sh
+++ b/scripts/expat.sh
@@ -1,4 +1,6 @@
-download_and_extract "http://jaist.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" expat-2.0.1
+EXPAT_VERSION=2.1.0
+
+download_and_extract http://jaist.dl.sourceforge.net/project/expat/expat/$EXPAT_VERSION/expat-$EXPAT_VERSION.tar.gz expat-$EXPAT_VERSION
 ## Patch
 cp ../../patches/config.sub ./config.sub
 cp ../../patches/config.sub ./conftools/config.sub
diff --git a/scripts/libmikmod.sh b/scripts/libmikmod.sh
index da00fa6..ef22f49 100755
--- a/scripts/libmikmod.sh
+++ b/scripts/libmikmod.sh
@@ -1,6 +1,6 @@
 download_and_extract http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz libmikmod-3.2.0-beta2
 apply_patch libmikmod-3.2.0-beta2-PSP
 autoconf
-run_configure
+run_configure --disable-esd
 run_make -j 4
 
diff --git a/scripts/libpng.sh b/scripts/libpng.sh
index def5175..e5e401d 100755
--- a/scripts/libpng.sh
+++ b/scripts/libpng.sh
@@ -1,3 +1,6 @@
+test_deps_install zlib
+
 get_pspports libpng
 run_make -j 4
 
+ln -s $(psp-config --psp-prefix)/lib/libpng.a $(psp-config --psp-prefix)/lib/libpng12.a
diff --git a/scripts/libyaml.sh b/scripts/libyaml.sh
index 115b723..0700d40 100755
--- a/scripts/libyaml.sh
+++ b/scripts/libyaml.sh
@@ -1,4 +1,6 @@
-download_and_extract http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz yaml-0.1.3
+LIBYAML_VERSION=0.1.4
+
+download_and_extract http://pyyaml.org/download/libyaml/yaml-$LIBYAML_VERSION.tar.gz yaml-$LIBYAML_VERSION
 cp ../../patches/config.sub ./config/config.sub
 run_configure
 run_make -j 4
diff --git a/scripts/openal.sh b/scripts/openal.sh
new file mode 100755
index 0000000..931f05f
--- /dev/null
+++ b/scripts/openal.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# openal-soft.sh by take_cheeze (takechi101010@gmail.com)
+
+test_deps_install cmake-toolchain-script pthreads-emb
+
+OPENAL_VERSION=1.14
+
+download_and_extract http://kcat.strangesoft.net/openal-releases/openal-soft-$OPENAL_VERSION.tar.bz2 openal-soft-$OPENAL_VERSION
+
+## replace memory.h with string.h
+sed -i -e "s/memory\.h/string.h/" Alc/*.c Alc/backends/*.c || { exit 1; }
+
+## Run cmake
+psp-cmake -D CMAKE_INSTALL_PREFIX=$(psp-config --psp-prefix) . || { exit 1; }
+
+## Compile and Install
+run_make -j 4
diff --git a/scripts/opentri.sh b/scripts/opentri.sh
index 4a26dfb..bda6bbd 100755
--- a/scripts/opentri.sh
+++ b/scripts/opentri.sh
@@ -1,3 +1,5 @@
+test_deps_install zlib freetype
+
 wget --continue --no-check-certificate https://github.com/SamRH/openTRI/tarball/master -O openTRI.tar.gz
 rm -Rf openTRI && mkdir openTRI && tar --strip-components=1 --directory=openTRI -xvzf openTRI.tar.gz
 cd openTRI
diff --git a/scripts/pixman.sh b/scripts/pixman.sh
index a0fe636..c4bd906 100755
--- a/scripts/pixman.sh
+++ b/scripts/pixman.sh
@@ -1,5 +1,7 @@
-download_and_extract http://cairographics.org/releases/pixman-0.22.0.tar.gz pixman-0.22.0
+PIXMAN_VERSION=0.24.4
+
+download_and_extract http://cairographics.org/releases/pixman-$PIXMAN_VERSION.tar.gz pixman-$PIXMAN_VERSION
 cp ../../patches/config.sub ./config.sub
-run_configure
+LIBS="-lz" run_configure
 run_make -j 4
 
diff --git a/scripts/pspgl.sh b/scripts/pspgl.sh
index 02d6da5..0bcb6ec 100755
--- a/scripts/pspgl.sh
+++ b/scripts/pspgl.sh
@@ -1,3 +1,10 @@
 get_pspports pspgl
-run_make -j 4
 
+for i in glLockArraysEXT pspgl_dlist pspgl_vidmem
+do
+echo '#include <psptypes.h>' > $i.c.tmp
+cat $i.c >> $i.c.tmp
+cat $i.c.tmp > $i.c
+done
+
+run_make -j 4
diff --git a/scripts/ruby.sh b/scripts/ruby.sh
deleted file mode 100755
index 820ea7c..0000000
--- a/scripts/ruby.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-download_and_extract ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p180.tar.bz2 ruby-1.9.2-p180
-cp ../../patches/config.sub tool/config.sub
-patch -p1 < ../../patches/ruby-1.9.2-p180.patch
-
-## Configure
-LDSHARED="psp-ld -Bdynamic -Bshareable" \
-CFLAGS="-include sys/fd_set.h -I$(psp-config --pspsdk-path)/include -G0 -U RUSAGE_SELF -U NO_SAFE_RENAME -D PSP" \
-LDFLAGS="-L$(psp-config --pspsdk-path)/lib -flto" \
-LIBS="-lpthread-psp -lpspsdk -lc -lpspuser -lpspnet_inet" \
-ac_cv_func_setpgrp_void="yes" \
-./configure -C \
-    --host=psp \
-    --prefix=$(psp-config --psp-prefix) \
-    --disable-install-doc
-
-run_make -j 4
-
diff --git a/scripts/smpeg-psp.sh b/scripts/smpeg-psp.sh
index 841387c..1c685d3 100755
--- a/scripts/smpeg-psp.sh
+++ b/scripts/smpeg-psp.sh
@@ -4,5 +4,6 @@ else
   svn update smpeg-psp
 fi
 cd smpeg-psp
+sed -i -e "s/static __inline__ Uint16 SDL_Swap16(Uint16 x)/static __inline__ Uint16 Disable_SDL_Swap16(Uint16 x)/" audio/*.cpp || { exit 1; }
 run_make -j 4
 
diff --git a/scripts/squirrel.sh b/scripts/squirrel.sh
index ebfc055..64d043c 100755
--- a/scripts/squirrel.sh
+++ b/scripts/squirrel.sh
@@ -1,6 +1,6 @@
-download_and_extract http://squirrel.googlecode.com/files/squirrel_3_0_stable.tar.gz SQUIRREL3
-apply_patch squirrel-3.0
-AR="psp-ar" CC="psp-gcc" CXX="psp-g++" LIBS="-lc -lpspuser" run_make -j 4 sq32
+download_and_extract http://squirrel.googlecode.com/files/squirrel_3_0_2_stable.tar.gz SQUIRREL3
+apply_patch squirrel-3.0.2
+AR="psp-ar" CC="psp-gcc" CXX="psp-g++" LIBS="-lc -lpspuser" make -j 4 -C squirrel sq32
+AR="psp-ar" CC="psp-gcc" CXX="psp-g++" LIBS="-lc -lpspuser" make -j 4 -C sqstdlib sq32
 cp -v lib/*.a $(psp-config --psp-prefix)/lib
 cp -v include/*.h $(psp-config --psp-prefix)/include
-
diff --git a/scripts/zziplib.sh b/scripts/zziplib.sh
index fb4e0c5..9f8a938 100755
--- a/scripts/zziplib.sh
+++ b/scripts/zziplib.sh
@@ -1,4 +1,4 @@
-test_deps zlib
+test_deps_install zlib
 get_pspports zziplib
 run_configure
 run_make -j 4