From cc94bf173399771a6d0c1f0d277db52f8b2d3de9 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 22 Oct 2015 10:23:09 -0400
Subject: [PATCH] Changes to run 32-bit Autopsy with PostgreSQL

---
 build-windows.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/build-windows.xml b/build-windows.xml
index a293511b15..e8cbf72f2a 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -30,9 +30,11 @@
         <property name="win64.TskLib.path" value="${env.TSK_HOME}/win32/x64/Release_PostgreSQL"/>
         <property name="win32.TskLib.path" value="${env.TSK_HOME}/win32/Release_PostgreSQL" />
         <property name="win64.TskLib.postgres_path" value="${env.TSK_HOME}/win32/x64/Release_PostgreSQL"/>
+        <property name="win32.TskLib.postgres_path" value="${env.TSK_HOME}/win32/Release_PostgreSQL"/>
         <available property="win64.TskLib.exists" type="dir" file="${win64.TskLib.path}" />
         <available property="win32.TskLib.exists" type="dir" file="${win32.TskLib.path}" />
         <available property="win64.TskLib_postgres.exists" type="dir" file="{win64.TskLib.postgres_path}" />
+        <available property="win32.TskLib_postgres.exists" type="dir" file="{win32.TskLib.postgres_path}" />
     </target>
 
     <!-- The following copy the libtsk_jni dependencies to the Autopsy
@@ -68,23 +70,35 @@
     <target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists">
         <fileset dir="${win32.TskLib.path}" id="win32dlls">
             <include name="zlib.dll" />
-            <include name="libewf.dll"/>
+            <include name="libewf.dll"/>          
+        </fileset>
+        
+        <fileset dir="${win32.TskLib.postgres_path}" id="postgres32dlls">
+            <include name="libeay32.dll"/>
+            <include name="ssleay32.dll"/>
+            <include name="intl.dll"/>
+            <include name="libpq.dll"/>
+            <include name="msvcr120.dll"/>
         </fileset>
 
         <copy todir="${i386}" overwrite="true">
             <fileset refid="win32dlls" />
+            <fileset refid="postgres32dlls" />
         </copy>
 
         <copy todir="${x86}" overwrite="true">
             <fileset refid="win32dlls" />
+            <fileset refid="postgres32dlls" />
         </copy>
 
         <copy todir="${i586}" overwrite="true">
             <fileset refid="win32dlls" />
+            <fileset refid="postgres32dlls" />
         </copy>	
 
         <copy todir="${i686}" overwrite="true">
             <fileset refid="win32dlls" />
+            <fileset refid="postgres32dlls" />
         </copy>
     </target>