libgda: aggiustamenti e compilazione a 64bit (WIP no oracle).

diff --git a/packages/mingw-w64-libgda-full/PKGBUILD b/packages/mingw-w64-libgda-full/PKGBUILD
index 4746f2997e48817b6b94e9391864c43bc4651f85..64995c1c9fad853db259a1a30aa7c85fe57616cb 100644 (file)
--- a/packages/mingw-w64-libgda-full/PKGBUILD
+++ b/packages/mingw-w64-libgda-full/PKGBUILD
@@ -63,6 +63,7 @@ prepare() {
 
 build() {
   if [ "${CARCH}" = "i686" ]; then
+<<<<<<< HEAD
     local _conf='--with-oracle=/instantclient_11_2_i686/sdk --with-oracle-libdir-name=lib'
     export GRAPHVIZ_CFLAGS="-I/graphviz-2.38_i686/include/graphviz"
     export GRAPHVIZ_LIBS="-L/graphviz-2.38_i686/lib/release/dll -lgvc -lcgraph -lcdt"
@@ -70,6 +71,15 @@ build() {
     local _conf='--with-oracle=/instantclient_11_2_x86_64/sdk --with-oracle-libdir-name=lib'
     #export GRAPHVIZ_CFLAGS="-I/graphviz-2.38_x86_64/include/graphviz"
     #export GRAPHVIZ_LIBS="-L/graphviz-2.38_x86_64/lib/release/dll -lgvc -lcgraph -lcdt"
+=======
+    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
+    export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/include/graphviz"
+    export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
+  else
+    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
+    #export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/include/graphviz"
+    #export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
+>>>>>>> libgda: aggiustamenti e compilazione a 64bit (WIP no oracle).
   fi
 
   mkdir -p build-${MINGW_CHOST}