x86_64環境とi686環境を共存させるよう、ディレクトリ構成などを変更。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@610 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/bin/lib/7zArc.xml b/bin/lib-i686/7zArc.xml
similarity index 100%
rename from bin/lib/7zArc.xml
rename to bin/lib-i686/7zArc.xml

diff --git a/bin/lib/calLibrary.xml b/bin/lib-i686/calLibrary.xml
similarity index 100%
rename from bin/lib/calLibrary.xml
rename to bin/lib-i686/calLibrary.xml

diff --git a/bin/lib/cuiWrapper.xml b/bin/lib-i686/cuiWrapper.xml
similarity index 100%
rename from bin/lib/cuiWrapper.xml
rename to bin/lib-i686/cuiWrapper.xml

diff --git a/bin/lib-x86_64/7zArc.xml b/bin/lib-x86_64/7zArc.xml
new file mode 100644 (file)
index 0000000..89b53f1
--- /dev/null
+++ b/bin/lib-x86_64/7zArc.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../doc/instance.xsl"?>
+<libraries
+  xsi:noNamespaceSchemaLocation="../../doc/schema.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <library name="0x01" typename="7-zip"    suffix="zip"         extract='%a5' test=''
+        level-min="0" level-max="9"
+        create  ='-mx=%94 %a5 %a7 %a1'
+        add-disabled='-mx=%94 %a5' />
+ <library name="0x02" typename="BZip2"    suffix="bz2"         extract='%a5' test='' archive="0"
+        level-min="0" level-max="9"
+        create  ='-mx=%94' />
+ <library name="0x03" typename="Rar"      suffix="rar"         extract='%a5 %a1' test='' disable="1" />
+ <library name="0x04" typename="Arj"      suffix="arj"         extract='%a5 %a1' test='' disable-win="1" />
+ <library name="0x05" typename="Z"        suffix="Z"           extract='%a5' test='' archive="0" />
+ <library name="0x06" typename="Lzh"      suffix="lzh;lha;lzs" extract='%a1' test='' disable-win="1" />
+ <library name="0x07" typename="7z"       suffix="7z"          extract=''    test=''
+        level-min="0" level-max="9"
+        create  ='-mx=%94 -ms=%a2{on|off} -mhe=%a4{on|off} %a5 %a7 %a1'
+        add-disabled='-mx=%94 -ms=%a2{on|off} -mhe=%a4{on|off} %a5'
+        delete-disabled='' />
+ <library name="0x08" typename="Cab"      suffix="cab"         extract='%a1' test='' disable-win="1" />
+ <library name="0x09" typename="NSIS"     suffix="exe"         extract='%a1' test='' />
+ <library name="0x0a" typename="LZMA"     suffix="lzma"        extract=''    test='' />
+ <library name="0x0b" typename="LZMA86"   suffix="lzma"        extract=''    test='' />
+ <library name="0x0d" typename="PPMd"     suffix="pmd"         extract=''    test='' archive="0" />
+ <library name="0xcf" typename="TE"       suffix="te"          extract=''    test='' />
+ <library name="0xd0" typename="UEFIc"    suffix="scap"        extract=''    test='' />
+ <library name="0xd1" typename="UEFIs"                         extract=''    test='' />
+ <library name="0xd2" typename="SquashFS" suffix="squashfs"    extract=''    test='' />
+ <library name="0xd3" typename="CramFS"   suffix="cramfs"      extract=''    test='' />
+ <library name="0xd4" typename="Apm"                           extract=''    test='' />
+ <library name="0xd5" typename="MSLZ"                          extract=''    test='' archive="0" />
+ <library name="0xd6" typename="FLV"      suffix="flv"         extract=''    test='' />
+ <library name="0xd7" typename="Swf"      suffix="swf"         extract=''    test='' disable="1" />
+ <library name="0xd8" typename="SWFc"     suffix="swf"         extract=''    test='' />
+ <library name="0xd9" typename="NTFS"     suffix="ntfs;img"    extract=''    test='' />
+ <library name="0xda" typename="FAT"      suffix="fat;img"     extract=''    test='' />
+ <library name="0xdb" typename="MBR"      suffix="mbr"         extract=''    test='' />
+ <library name="0xdc" typename="VHD"      suffix="vhd"         extract=''    test='' />
+ <library name="0xdd" typename="PE"       suffix="exe"         extract=''    test='' disable="1" />
+ <library name="0xde" typename="ELF"                           extract=''    test='' disable="1" />
+ <library name="0xdf" typename="Mach-O"                        extract=''    test='' />
+ <library name="0xe0" typename="UDF"      suffix="iso;img"     extract=''    test='' />
+ <library name="0xe1" typename="Xar"      suffix="xar"         extract=''    test='' />
+ <library name="0xe2" typename="Mub"      suffix="mub"         extract=''    test='' />
+ <library name="0xe3" typename="HFS"      suffix="hfs"         extract=''    test='' />
+ <library name="0xe4" typename="DMG"      suffix="dmg"         extract=''    test='' />
+ <library name="0xe5" typename="Compound" suffix="msi;msp"     extract=''    test='' />
+ <library name="0xe6" typename="WIM"      suffix="wim;swm"     extract=''    test=''
+        create  =''
+        add-disabled='' />
+ <library name="0xe7" typename="Iso"      suffix="iso;img"     extract=''    test='' />
+ <library name="0xe9" typename="Chm"      suffix="chm;chi;chq;chw;hxs;hxi;hxr;hxq;hxw;lit" extract='' test='' />
+ <library name="0xea" typename="Split"    suffix="001"         extract=''    test='' />
+ <library name="0xeb" typename="RPM"      suffix="rpm"         extract=''    test='' disable-win="1" />
+ <library name="0xec" typename="Deb"      suffix="deb"         extract=''    test='' disable-win="1" />
+ <library name="0xed" typename="Cpio"     suffix="cpio"        extract=''    test='' disable-win="1" />
+ <library name="0xee" typename="TAR"      suffix="tar"         extract=''    test='' disable-win="1"
+        create  =''
+        add-disabled='' />
+ <library name="0xef" typename="GZip"     suffix="gz"          extract=''    test='' archive="0"
+        level-min="0" level-max="9"
+        create  ='-mx=%94' />
+ <library name="0x0c" typename="XZ"       suffix="xz"          extract=''    test='' archive="0" disable-win="1"
+        level-min="0" level-max="9"
+        create  ='-mx=%94' />
+</libraries>

diff --git a/bin/lib-x86_64/calLibrary.xml b/bin/lib-x86_64/calLibrary.xml
new file mode 100644 (file)
index 0000000..8bd5c31
--- /dev/null
+++ b/bin/lib-x86_64/calLibrary.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../doc/instance.xsl"?>
+<libraries
+  xsi:noNamespaceSchemaLocation="../../doc/schema.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <library name="unlha32.dll" prefix="Unlha" unicode="1" typename="Lzh" suffix="lzh;lha;lzs"
+        sfx     ='s -n -gw4 "-gr%93" --3 "%90" "%91"'
+        unsfx   ='j -n --3 "%93" "%90"'
+        create  ='a -n -r2 -a1 -x%a0 %a1{-gw3|} -jso1 --3 "%90" "%91" "@%92"'
+        add     ='a -n -r2 -a1 -x%a0 -jso1 --3 "%90" "%91" "@%92"'
+        extract ='x -n -r2 -a1 -x%a0 -jse2 --3 "%90" "%91" "@%92"'
+        delete  ='d -n -r2 --3 "%90" "@%92"'
+        test    ='t -n -r2 --3 "%90" "@%92"' />
+ <library name="cab32.dll" prefix="Cab" typename="Cab" suffix="cab"
+        sfx     ='-f "%90" "%91"'
+        extract ='-x -r -i %a0{|-j} "%90" "%91" "@%92"'
+        test    ='-t -r "%90" "@%92"' />
+ <library name="cab32.dll" prefix="Cab" typename="Cab(Store)" suffix="cab"
+        create  ='-a -r -i %a0{|-j} -ms %a7{-v:#|} "%90" "%91" "@%92"' />
+ <library name="cab32.dll" prefix="Cab" typename="Cab(MSZip)" suffix="cab"
+        create  ='-a -r -i %a0{|-j} -mz %a7{-v:#|} "%90" "%91" "@%92"' />
+ <library name="cab32.dll" prefix="Cab" typename="Cab(LZX)" suffix="cab"
+        level-min="15" level-max="21"
+        create  ='-a -r -i %a0{|-j} -ml:%94 %a7{-v:#|} "%90" "%91" "@%92"' />
+ <library name="unzip32.dll" prefix="UnZip" name-alt="zip32j.dll" prefix-alt="Zip" typename="Zip" suffix="zip"
+        level-min="0" level-max="9"
+        extract   ='-x --i -qUdde %a0{|-j} %a5{"-P#"|} "%90" "%91" "@%92"'
+        test      ='-t --i -qudde "%90" "@%92"'
+        sfx-alt   ='--sfx "%90" "%91"'
+        unsfx-alt ='-J "%90" "%91"'
+        create-alt='-q -S -r %a0{|-j} -%94 %a5{-P "#"|} %a1{--sfx|} "%90" "%91" "@%92"'
+        add-alt   ='-q -S -r %a0{|-j} -%94 %a5{-P "#"|} "%90" "%91" "@%92"'
+        delete-alt='-d -q -S -r "%90" "%91" "@%92"'
+        repair-alt='-F "%90"' />
+ <library name="tar32.dll" prefix="Tar" typename="Tar" suffix="tar;bz;bz2;gz;lzma;xz;Z;tbz2;tbz;tgz;tlz;txz;taz;tz"
+        create  ='-c --use-directory=%a0 --display-dialog=0 --message-loop=0 --inverse-procresult=1 -- "%90" "%91" "@%92"'
+        extract ='-x --use-directory=%a0 --display-dialog=0 --message-loop=0 --inverse-procresult=1 --confirm-overwrite=1 -- "%90" "%91" "@%92"' />
+ <library name="tar32.dll" prefix="Tar" typename="Tar+BZip2" suffix="tar.bz2;tar.bz;tbz2;tbz"
+        level-min="1" level-max="9"
+        create  ='-c -B%94 --use-directory=%a0 --display-dialog=0 --inverse-procresult=1 -- "%90" "%91" "@%92"' />
+ <library name="tar32.dll" prefix="Tar" typename="Tar+GZip" suffix="tar.gz;tgz"
+        level-min="1" level-max="9"
+        create  ='-c -z%94 --use-directory=%a0 --display-dialog=0 --inverse-procresult=1 -- "%90" "%91" "@%92"' />
+ <library name="tar32.dll" prefix="Tar" typename="Tar+LZMA" suffix="tar.lzma;tlz"
+        level-min="1" level-max="9"
+        create  ='-c --lzma=%94 --use-directory=%a0 --display-dialog=0 --inverse-procresult=1 -- "%90" "%91" "@%92"' />
+ <library name="tar32.dll" prefix="Tar" typename="Tar+XZ" suffix="tar.xz;txz"
+        level-min="1" level-max="9"
+        create  ='-c -J%94 --use-directory=%a0 --display-dialog=0 --inverse-procresult=1 -- "%90" "%91" "@%92"' />
+ <library name="UnGCA32.dll" prefix="UnGCA" typename="GCA"
+        extract ='ex -sx0 -xx%a0 %a5{-p "#"|} %a6{-k "#"|} "%90" "%91" "@%92"' />
+ <library name="UnAceV2J.dll" prefix="UnAce" typename="Ace" quote-resp="0"
+        extract ='%a0{x|e} --hide %a5{"-p#"|} "%90" "%91" "@%92"'
+        test    ='t --hide "%90" "@%92"' />
+ <library name="unarj32j.dll" prefix="Unarj" typename="Arj" unicode="1"
+        extract ='%a0{x|e} -i -!@ -hte+ -- "%90" "%91" "@%92"'
+        test    ='t -i -- "%90" "@%92"' />
+ <library name="yz1.dll" prefix="Yz1" typename="Yz1" suffix="yz1"
+        sfx     ='s -i2 "%90" "%91"'
+        unsfx   ='j -i2 "%90" "%91"'
+        create  ='c -i2 %a5{"-p#"|} -x%a0 %a1{-s|} "%90" "%91" "@%92"'
+        extract ='x -i2 %a5{"-p#"|} -x%a0 "%90" "%91" "@%92"' />
+ <library name="Bga32.dll" prefix="Bga" typename="GZA/BZA" suffix="gza;bza"
+        level-min="1" level-max="9"
+        sfx     ='s "%90" "%91"'
+        unsfx   ='j "%90" "%91"'
+        add     ='a -a -i -r -l%94 "%90" "%91" "@%92"'
+        extract ='x -a -i -r %a0{|-j} "%90" "%91" "@%92"'
+        delete  ='d -i "%90" "@%92"'
+        test    ='t -i "%90" "@%92"' />
+ <library name="Bga32.dll" prefix="Bga" typename="GZA" suffix="gza"
+        level-min="1" level-max="9"
+        create  ='a -a -i -r -l%94 -m1 "%90" "%91" "@%92"' />
+ <library name="Bga32.dll" prefix="Bga" typename="BZA" suffix="bza"
+        level-min="1" level-max="9"
+        create  ='a -a -i -r -l%94 -m2 "%90" "%91" "@%92"' />
+
+ <!-- Samples(older, disabled): -->
+
+ <library name="7-zip32.dll" prefix="SevenZip" typename="7z" suffix="7z" disable="1"
+        level-min="0" level-max="9"
+        create  ='a -mx=%94 -hide -ssw -ms=%a2{on|off} -mhe=%a4{on|off} %a5{"-p#"|} %a7{-v#|} %a1{-sfx|} -t7z -- "%90" "%91" "@%92"'
+        add     ='a -mx=%94 -hide -ssw -ms=%a2{on|off} -mhe=%a4{on|off} %a5{"-p#"|} -- "%90" "%91" "@%92"'
+        extract ='%a0{x|e} -hide %a5{"-p#"|} "-o%91" -- "%90" "@%92"'
+        delete  ='d -hide -ms=off -- "%90" "@%92"'
+        test    ='t -- "%90" "@%92"' />
+ <library name="7-zip32.dll" prefix="SevenZip" typename="7-Zip" suffix="zip" disable="1"
+        level-min="0" level-max="9"
+        create  ='a -mx=%94 -hide -ssw %a5{"-p#"|} %a7{-v#|} %a1{-sfx|} -tzip -- "%90" "%91" "@%92"'
+        add     ='a -mx=%94 -hide -ssw %a5{"-p#"|} -- "%90" "%91" "@%92"' />
+ <library name="UnIso32.dll" prefix="UnIso" typename="Iso" disable="1"
+        extract ='%a0{x|e} -hide "-o%91" -- "%90" "@%92"'
+        test    ='t -- "%90" "@%92"' />
+ <library name="unrar32.dll" prefix="Unrar" typename="Rar" disable="1"
+        extract ='-%a0{x|e} -s -r -q %a5{"-p#"|} -- "%90" "%91" "@%92"' />
+ <library name="XacRett.dll" prefix="XacRett" typename="XacRett" disable="1"
+        extract ='x -n1 %a0{|-j} "%90" "%91" "@%92"' />
+</libraries>

diff --git a/bin/lib-x86_64/cuiWrapper.xml b/bin/lib-x86_64/cuiWrapper.xml
new file mode 100644 (file)
index 0000000..e7b50fc
--- /dev/null
+++ b/bin/lib-x86_64/cuiWrapper.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../doc/instance.xsl"?>
+<libraries
+  xsi:noNamespaceSchemaLocation="../../doc/schema.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <library name="tar" typename="Tar+BZip2" suffix="tar.bz2;tar.bz;tbz2;tbz" quote-resp="0"
+        create  ='-c -j -f "%90" -T "%92"' />
+ <library name="tar" typename="Tar+GZip" suffix="tar.gz;tgz" quote-resp="0"
+        create  ='-c -z -f "%90" -T "%92"' />
+ <library name="tar" typename="Tar+LZMA" suffix="tar.lzma;tlz" quote-resp="0"
+        create  ='-c --lzma -f "%90" -T "%92"' />
+ <library name="tar" typename="Tar+XZ" suffix="tar.xz;txz" quote-resp="0"
+        create  ='-c -J -f "%90" -T "%92"' />
+ <library name="tar" typename="Tar+Z" suffix="tar.Z;taz;tz" quote-resp="0"
+        create  ='-c -Z -f "%90" -T "%92"' />
+ <library name="tar" typename="Tar" suffix="tar.bz2;tar.bz;tar.gz;tar.lzma;tar.xz;tar.Z;tbz2;tbz;tgz;tlz;txz;taz;tz" quote-resp="0"
+        list    ='-t -v -f "%90" | awk &apos;{ printf "%%10d %%s %%s %%s %%s %%s\n",$3,$4,$5,$6,$7,$8 }&apos;'
+        list-line-s ='' list-line-c = "1"
+        list-fname-s="28"
+        list-usize-s= "0" list-usize-c="10"
+        list-date-s ="11" list-date-c ="16" list-date-f="%Y-%m-%d %H:%M"
+        extract ='-x %a0{|--xform=&apos;s|.*/\([^/]*\)|\1|&apos;} -f "%90" -C "%91" -T "%92"' />
+ <library name="innounp.exe" typename="Inno" suffix="inno"
+        list    ='-v -m "%90"'
+        list-line-s ='--------------------------------------' list-line-c="1"
+        list-fname-s="30"
+        list-usize-s= "0" list-usize-c="10"
+        list-date-s ="12" list-date-c ="16" list-date-f="%Y.%m.%d %H:%M"
+        extract ='-%a0{x|e} -m %a5{"-p#"|} "-d%91" "%90" "@%92"' />
+ <library name="dgcac" typename="DGCA" suffix="dgc" quote-resp="0"
+        list    ='l "%90"'
+        list-line-s ='------------------------- ------------------- ------------ ------------ -------' list-line-c="1"
+        list-fname-s= "0" list-fname-c="25"
+        list-usize-s="46" list-usize-c="12"
+        list-psize-s="60" list-psize-c="12"
+        list-date-s ="26" list-date-c ="19" list-date-f="%Y/%m/%d %H:%M:%S"
+        create  ='a %a5{"-p#"|} %a6{"-k#"|} "-o%92" "%90"'
+        extract ='e %a5{"-p#"|} %a6{"-k#"|} "-o%92" "%90"'
+        test    ='k "%90"' />
+ <library name="gcac" typename="GCA" suffix="gca" quote-resp="0"
+        create  ='%a2{s|a} %a5{"-p#"|} %a6{"-k#"|} "-o%92" "%90"' />
+
+ <!-- Samples(older,disabled): -->
+
+ <library name="7z" typename="7z" suffix="7z;zip;lzh;lha;cab;rpm;deb;cpio;iso;dmg;hfs;msi" disable="1"
+        list    ='l -- "%90"'
+        list-line-s ='------------------- ----- ------------ ------------  ------------------------' list-line-c="1"
+        list-fname-s="53"
+        list-usize-s="26" list-usize-c="12"
+        list-psize-s="40" list-psize-c="12"
+        list-date-s = "0" list-date-c ="19" list-date-f="%Y-%m-%d %H:%M:%S"
+        level-min="0" level-max="9"
+        create  ='a -mx=%94 -ms=%a2{on|off} -mhe=%a4{on|off} %a5{"-p#"|} %a7{-v#|} %a1{-sfx|} -t7z -- "%90" "@%92"'
+        add     ='a -mx=%94 -ms=%a2{on|off} -mhe=%a4{on|off} %a5{"-p#"|} -- "%90" "@%92"'
+        extract ='%a0{x|e} %a5{-p#|} "-o%91" -- "%90" "@%92"'
+        delete  ='d -ms=off -- "%90" "@%92"'
+        test    ='t -- "%90" "@%92"' />
+ <library name="gzip" typename="GZip" suffix="gz;Z" quote-resp="0" archive="0" disable="1"
+        list    ='-l -v "%90"'
+        list-line-s ='method  crc     date  time           compressed        uncompressed  ratio uncompressed_name' list-line-c = "1"
+        list-fname-s="75"
+        list-usize-s="48" list-usize-c="19"
+        list-psize-s="28" list-psize-c="19"
+        list-date-s ="15" list-date-c ="12" list-date-f="%b %d %H:%M"
+        level-min="1" level-max="9"
+        create  ='-%94 -c `cat "%92"` &gt; "%90"'
+        extract ='-d -c "%90" &gt; "%91`basename "%90" .gz`"'
+        test    ='-t "%90"' />
+ <library name="tar" typename="Tar" suffix="tar" quote-resp="0" disable="1"
+        create  ='-c -f "%90" -T "%92"'
+        add     ='-r -f "%90" -T "%92"'
+        delete  ='--delete -f "%90" -T "%92"' />
+ <library name="unrar" typename="Rar" suffix="rar" disable="1"
+        list    ='v -c- -- "%90"'
+        list-line-s ='-------------------------------------------------------------------------------' list-line-c="2"
+        list-fname-s= "1"
+        list-usize-s="14" list-usize-c= "8" list-usize-l="1"
+        list-psize-s="23" list-psize-c= "8" list-psize-l="1"
+        list-date-s ="37" list-date-c ="14" list-date-l ="1" list-date-f="%d-%m-%y %H:%M"
+        extract ='%a0{x|e} %a5{"-p#"|} -- "%90" "@%92" "%91"'
+        test    ='t -- "%90" "@%92"' />
+</libraries>

diff --git a/bin/lychee.desktop b/bin/lychee.desktop
index 4d529bd..d7d3415 100644 (file)
--- a/bin/lychee.desktop
+++ b/bin/lychee.desktop
@@ -3,10 +3,9 @@
 Version=1.0
 Encoding=UTF-8
 Name=Lychee
-Exec=/mnt/data/Dropbox/tpi/bin/lychee %F
+Exec=/mnt/data/Dropbox/tpi/bin/lychee-`uname -m` %F
 Categories=GTK;KDE;Utility;Archiving;
 Icon=/mnt/data/Dropbox/tpi/share/ico/app.png
 MimeType=application/vnd.ms-cab-compressed;application/x-7z-compressed;application/x-apple-diskimage;application/x-archive;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-cpio-compressed;application/x-deb;application/x-gzip;application/x-java-archive;application/x-lha;application/x-lzma;application/x-lzma-compressed-tar;application/x-ms-wim;application/x-msi;application/x-rar;application/x-rpm;application/x-tar;application/x-tarz;application/x-xz;application/x-xz-compressed-tar;application/zip;
-StartupNotify=true
 Terminal=false
 Type=Application

diff --git a/src/common/Makefile.default b/src/common/Makefile.default
index 11f1c54..5344782 100644 (file)
--- a/src/common/Makefile.default
+++ b/src/common/Makefile.default
@@ -6,19 +6,29 @@ CC = g++
 CPPFLAGS = -c -O3 -Wall -Wextra -fno-exceptions -fno-rtti -fPIC `wx-config --cxxflags`
 LDFLAGS  = -s
 
+# Check the architecture.
+ARCH = $(shell uname -m)
+ifdef DIR_OBJ
+  FULL_OBJ = $(DIR_OBJ)-$(ARCH)
+  FULL_OBJS= $(addprefix $(FULL_OBJ)/,$(OBJS))
+endif
+ifdef OUT_EXE
+  FULL_EXE = $(OUT_EXE)-$(ARCH)
+endif
+
 .PHONY: all clean
 .SUFFIXES: .cpp .o
 
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD) $(OUT_EXE)
+all: $(FULL_OBJ) $(FULL_OBJS) $(IN_ADD) $(FULL_EXE)
 
 clean:
-       rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS)) $(OUT_EXE)
+       rm -f -r $(FULL_OBJS) $(FULL_EXE)
 
-$(OUT_EXE): $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD)
-       $(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS)) `wx-config --libs`
+$(FULL_EXE): $(FULL_OBJS) $(IN_ADD)
+       $(CC) $(LDFLAGS) -o $(FULL_EXE) $(FULL_OBJS) `wx-config --libs`
 
-$(DIR_OBJ)/%.o: %.cpp
+$(FULL_OBJ)/%.o: %.cpp
        $(CC) $(CPPFLAGS) -o $@ $<
 
-$(DIR_OBJ):
-       mkdir $(DIR_OBJ)
+$(FULL_OBJ):
+       mkdir $(FULL_OBJ)

diff --git a/src/lychee/lychee.h b/src/lychee/lychee.h
index ef52b1f..34661b6 100644 (file)
--- a/src/lychee/lychee.h
+++ b/src/lychee/lychee.h
@@ -53,7 +53,11 @@
 \r
 #define L_DIR_BIN wxT("./")\r
 #define L_DIR_SHR wxT("../share/")\r
-#define L_DIR_B_LIB L_DIR_BIN wxT("lib/")\r
+#ifdef __x86_64__\r
+#define L_DIR_B_LIB L_DIR_BIN wxT("lib-x86_64/")\r
+#else\r
+#define L_DIR_B_LIB L_DIR_BIN wxT("lib-i686/")\r
+#endif\r
 #define L_DIR_S_XRC L_DIR_SHR wxT("xrc/")\r
 #define L_DIR_S_ICO L_DIR_SHR wxT("ico/")\r
 #define L_DIR_S_LOC L_DIR_SHR wxT("locale/")\r

diff --git a/src/plugin/Makefile.default b/src/plugin/Makefile.default
index 86f452f..9042189 100644 (file)
--- a/src/plugin/Makefile.default
+++ b/src/plugin/Makefile.default
@@ -7,7 +7,11 @@ CPPFLAGS = -c -fno-exceptions -fno-rtti -fPIC -Wall -Wextra `wx-config --cxxflag
 LDFLAGS  = -shared -Wl,-Bsymbolic -s\r
 \r
 # Define i/o files.\r
-DIR_OBJ  = ../../tmp/$(PLUGIN_NAME)\r
+ARCH = $(shell uname -m)\r
+DIR_OBJ  = ../../tmp-$(ARCH)/$(PLUGIN_NAME)\r
+DIR_LIB  = ../../../bin/lib-$(ARCH)\r
+OUT_LIB  = $(DIR_LIB)/$(PLUGIN_NAME).so\r
+IN_DEF   = ../../common/header/plugin.def\r
 OBJS     = $(PLUGIN_NAME).o\r
 ifndef NOUSE_LIBRARY\r
   OBJS  += ../library.o\r
@@ -16,8 +20,7 @@ ifndef NOUSE_XML
   OBJS  += ../xmldoc.o\r
 endif\r
 \r
-IN_DEF   = ../../common/header/plugin.def\r
-OUT_LIB  = ../../../bin/lib/$(PLUGIN_NAME).so\r
+FULL_OBJS=$(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))\r
 \r
 .PHONY: all clean\r
 .SUFFIXES: .cpp .o\r
@@ -25,10 +28,10 @@ OUT_LIB  = ../../../bin/lib/$(PLUGIN_NAME).so
 all: $(OUT_LIB)\r
 \r
 clean:\r
-       rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD)) $(OUT_LIB)\r
+       rm -f -r $(FULL_OBJS) $(OUT_LIB)\r
 \r
-$(OUT_LIB): $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))\r
-       $(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(dir $(OUT_LIB)) -Wl,-soname,$(notdir $(OUT_LIB)) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD)) `wx-config --libs`\r
+$(OUT_LIB): $(DIR_OBJ) $(FULL_OBJS)\r
+       $(CC) $(LDFLAGS) -o $(OUT_LIB) -L$(DIR_LIB) -Wl,-soname,$(notdir $(OUT_LIB)) $(FULL_OBJS) `wx-config --libs`\r
        chcon -t textrel_shlib_t $(OUT_LIB)\r
 \r
 $(DIR_OBJ):\r