X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2FMakefile;fp=db-mysql%2FMakefile;h=552b1f30a85e63715860f0a1cbc0c2861ed61c18;hp=6891f18dfd591285219b27116027fc7e9c1a3847;hb=244328d6a2b108b8d4448df06034ca088e313440;hpb=74a120dc168ad8dd9c193ddba70e60ccab08f021

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 6891f18..552b1f3 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -6,8 +6,6 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id$
-#
 # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
 # CLSQL users are granted the rights to distribute and use this software
@@ -22,6 +20,7 @@ base=clsql_mysql
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
+shared64_lib=$(base)64.so
 
 
 .PHONY: all
@@ -30,6 +29,9 @@ all: $(shared_lib)
 CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
 LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
+CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
+LDFLAGS32=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
+
 ifneq ($(OS_CYGWIN),0)
   CFLAGS=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
   LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lpthread -lz -lm -lgcc -lc
@@ -53,8 +55,17 @@ else
 	gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
 	ld -shared -soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
       else
-	gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-	ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+        ifneq ($(OS_LINUX64),0)
+	  gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
+	  rm $(object)
+	  @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
+	  gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+	  ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+        else
+	  gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+        endif
       endif
     endif
   endif