UPD: Use different directories (cpu architecture) for third party libraries

install/create_packages.bat

@@ -32,11 +32,6 @@ rem Copy needed files
 copy windows\doublecmd.iss %BUILD_PACK_DIR%\
 copy windows\portable.diff %BUILD_PACK_DIR%\
 
-rem Copy libraries
-copy windows\lib\*.dll %BUILD_DC_TMP_DIR%\
-
-cd /D %BUILD_DC_TMP_DIR%
-
 rem Get processor architecture
 if "%CPU_TARGET%" == "" (
   if "%PROCESSOR_ARCHITECTURE%" == "x86" (
@@ -48,6 +43,11 @@ if "%CPU_TARGET%" == "" (
   )
 )
 
+rem Copy libraries
+copy windows\lib\%CPU_TARGET%\*.dll    %BUILD_DC_TMP_DIR%\
+
+cd /D %BUILD_DC_TMP_DIR%
+
 rem Build all components of Double Commander
 call _make.bat all
 

install/create_packages.sh

@@ -21,11 +21,6 @@ cp -a ../.svn/entries $BUILD_DC_TMP_DIR/.svn/
 # Copy package description file
 cp linux/description-pak $BUILD_DC_TMP_DIR/
 
-# Copy libraries
-cp -a linux/lib/*.so $BUILD_DC_TMP_DIR/
-
-cd $BUILD_DC_TMP_DIR
-
 # Set widgetset
 if [ -z $1 ]
   then export lcl=gtk2
@@ -37,6 +32,11 @@ if [ -z $CPU_TARGET ]
   then export CPU_TARGET=$(fpc -iTP)
 fi
 
+# Copy libraries
+cp -a linux/lib/$CPU_TARGET/*.so    $BUILD_DC_TMP_DIR/
+
+cd $BUILD_DC_TMP_DIR
+
 # Build all components of Double Commander
 ./_make.sh all