--- deliantra/Deliantra-Client/makebin.osx 2010/04/24 07:07:19 1.18 +++ deliantra/Deliantra-Client/makebin.osx 2010/04/24 08:05:16 1.19 @@ -43,10 +43,10 @@ echo "docwiki.pst;root/Deliantra/Client/private/resources/docwiki.pst" #pangoversion;root/pangoversion -#/opt/local/lib/libglib-2.0.so.0;shlib/darwin-2level/libglib-2.0.dylib -#/lib/libgcc_s.so.1;shlib/darwin-2level/libgcc_s.so.1 -#/opt/local/lib/libstdc++.so.6;shlib/darwin-2level/libstdc++.so.6 -#/opt/local/lib/libaudio.so.2;shlib/darwin-2level/libaudio.so.2 +#/opt/local/lib/libglib-2.0.so.0;shlib/darwin-multi-2level/libglib-2.0.dylib +#/lib/libgcc_s.so.1;shlib/darwin-multi-2level/libgcc_s.so.1 +#/opt/local/lib/libstdc++.so.6;shlib/darwin-multi-2level/libstdc++.so.6 +#/opt/local/lib/libaudio.so.2;shlib/darwin-multi-2level/libaudio.so.2 ( echo "[Pango]"; echo "ModuleFiles = pango.modules" ) > pango.rc echo "pango.rc;root/pango.rc" @@ -66,10 +66,10 @@ pango-1.0.0 pangoft2-1.0.0 \ SDL-1.2.0 SDL_mixer-1.2.0 SDL_image-1.2.0 \ vorbisfile vorbis.0 ogg.0 \ - png12 jpeg.8 z.1 \ + png12.0 jpeg.8 tiff.3 z.1 \ fontconfig.1 expat.1 freetype.6 intl.8 iconv.2; do - echo "/opt/local/lib/lib$lib.dylib;shlib/darwin-2level/lib$lib.dylib" + echo "/opt/local/lib/lib$lib.dylib;shlib/darwin-multi-2level/lib$lib.dylib" done ) >addlist @@ -78,8 +78,6 @@ trap "rm -f addlist pango.rc pango.modules fonts.conf" 0 -cd /root/src/deliantra/Deliantra-Client - $PERL/bin/perl Makefile.PL make clean $PERL/bin/perl Makefile.PL