--- deliantra/Deliantra-Client/util/gatherer 2012/01/27 23:13:38 1.14 +++ deliantra/Deliantra-Client/util/gatherer 2012/01/28 00:03:31 1.15 @@ -68,10 +68,10 @@ eval $("$PERL" -V:sitebinexp:) -"$PERL" "$sitebinexp"/perl-libextractor --exedir . --dlldir . --bindir pm/bin --libdir pm \ +"$PERL" "$sitebinexp"/perl-libextractor \ --perl --core-support --script deliantra $EXTRA_EXTRACT \ --runtime-only \ - --copy "$DISTf" + --copy "$DISTf" --exedir . --dlldir . --bindir pm/bin --libdir pm cat <"$DIST"/pango.rc [Pango] @@ -138,15 +138,22 @@ ( cd "$DIST" - if [ "$OS" = windows ]; then - cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll . - cp /root/src/CFPlus/util/splash.bmp . - chmod -R u+rwX pm/auto + case "$OS" in + windows ) + cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll $SYSLIB/jpeg.dll . + cp -p $SYSLIB/jpeg.dll . + cp /root/src/CFPlus/util/splash.bmp . + chmod -R u+rwX pm/auto + + # convert perl to a non-console-app + $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write' + ;; + linux ) + cp -p $SYSLIB/libjpeg.so.62 . + ;; + esac - # convert perl to a non-console-app - $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write' - - else + if [ "$OS" != windows ]; then for lib in mikmod vorbisfile; do cp -p $SYSLIB/lib$lib.$LIB0 . chmod 755 lib$lib.$LIB0