--- deliantra/Deliantra-Client/makebin.linux	2008/09/30 03:05:07	1.19
+++ deliantra/Deliantra-Client/makebin.linux	2010/04/24 08:05:24	1.25
@@ -1,16 +1,37 @@
 #!/bin/bash
 
+# ./configure --disable-joystick --disable-cdrom --disable-alsa-shared --disable-esd-shared --disable-arts --disable-nas --disable-diskaudio --disable-dga --disable-video-fbcon --disable-video-directfb --disable-video-svga --disable-timidity
+
 # Convert a gtk2-perl program to a standalone linux binary
 
 EV_EVENTFD=
-PERL=/usr
-PERLLIB=/usr/lib/perl5/
+
+if [ $(arch) = i686 ]; then
+   PERL=/usr
+   PERLLIB=/usr/lib/perl5/
+   PP=/usr/bin/pp
+   LIBDB=db-4.6
+   ARCHNAME=x86
+   PERLARCH=i486-linux-gnu-thread-multi
+else
+   PERL=/usr
+   PERLLIB=/usr/lib/perl5/
+   PP=/usr/local/bin/pp
+   LIBDB=db-4.7
+   ARCHNAME=amd64
+   PERLARCH=x86_64-linux-gnu-thread-multi
+fi
+
 PANGO=1.5.0
 #PERL=/opt/perl
 #PERLLIB=/opt/perl/lib/perl5/
 #PANGO=1.6.0
 
-for mod in AnyEvent EV JSON-XS Deliantra Compress-LZF BDB; do
+export EV_EVENTFD=0
+export EV_INOTIFY=0
+export EV_SIGNALFD=0
+
+for mod in common-sense AnyEvent EV JSON-XS Deliantra Compress-LZF BDB Guard; do
    (
       cd /root/src/$mod
       $PERL/bin/perl Makefile.PL </dev/null
@@ -27,15 +48,14 @@
    printf "%s" "$PANGO" >pangoversion
 #pangoversion;root/pangoversion
    cat <<EOF
-pango-1.0.so.0;shlib/i486-linux-gnu-thread-multi/libpango-1.0.so.0
-/usr/lib/libglib-2.0.so.0;shlib/i486-linux-gnu-thread-multi/libglib-2.0.so.0
-/usr/lib/libstdc++.so.6;shlib/i486-linux-gnu-thread-multi/libstdc++.so.6
-/usr/lib/libaudio.so.2;shlib/i486-linux-gnu-thread-multi/libaudio.so.2
-/lib/libgcc_s.so.1;shlib/i486-linux-gnu-thread-multi/libgcc_s.so.1
-/usr/lib/pango/$PANGO;root/usr/lib/pango/$PANGO
-pango-1.0.so.0;shlib/i486-linux-gnu-thread-multi/libpango-1.0.so.0
+pango-1.0.so.0;shlib/$PERLARCH/libpango-1.0.so.0
+/usr/lib/libglib-2.0.so.0;shlib/$PERLARCH/libglib-2.0.so.0
+/usr/lib/libstdc++.so.6;shlib/$PERLARCH/libstdc++.so.6
+/lib/libgcc_s.so.1;shlib/$PERLARCH/libgcc_s.so.1
+pango-1.0.so.0;shlib/$PERLARCH/libpango-1.0.so.0
 docwiki.pst;root/Deliantra/Client/private/resources/docwiki.pst
 EOF
+#/usr/lib/pango/$PANGO;root/usr/lib/pango/$PANGO
 
    cat <<EOF >pango.rc
 [Pango]
@@ -69,7 +89,7 @@
    (
       cat /usr/lib/pango/$PANGO/module-files.d/* | grep ^/usr | while read so rest; do
          base=$(basename "$so")
-         echo "$so;root/$base"
+         echo "$so;root/$base" # puts them in twice
          echo "$base $rest" >&5
       done
    ) 5>pango.modules
@@ -88,22 +108,24 @@
 
 wait
 
+        #-l asound -l esd \
 LD_LIBRARY_PATH=/lib:/usr/lib \
-$PERL/bin/pp -C -I /root/src/Deliantra \
+$PP -C -I /root/src/Deliantra \
         -M AnyEvent::Impl::EV \
         -M attributes \
+        -M utf8 \
         -a "blib/arch/auto/Deliantra/Client/Client.so;lib/auto/Deliantra/Client/Client.so" \
-        -l db-4.6 \
+        -l $LIBDB \
         -l glib-2.0 -l gobject-2.0 -l gmodule-2.0 \
         -l pangoft2-1.0 \
-        -l SDL -l asound \
+        -l SDL \
         -l SDL_mixer -l vorbisfile -l vorbis -l ogg -l smpeg -l stdc++ \
         -l SDL_image -l png12 -l z \
-        -o deliantra-gnu-linux-x86 -A addlist bin/deliantra || exit
+        -o deliantra-gnu-linux-$ARCHNAME -A addlist bin/deliantra || exit
 
 make clean
 
-tar cf deliantra-gnu-linux-x86.tar deliantra-gnu-linux-x86
-gzip -9vf deliantra-gnu-linux-x86.tar
-todata deliantra-gnu-linux-x86.tar.gz
+tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME
+gzip -9vf deliantra-gnu-linux-$ARCHNAME.tar
+todata deliantra-gnu-linux-$ARCHNAME.tar.gz