From ab1f6a83747f6dccc378ea25b84e61e3550db09e28d92d0b84b9853dc6f7dc13 Mon Sep 17 00:00:00 2001 From: Victor Roman Archidona Date: Mon, 28 Jul 2014 11:42:06 +0000 Subject: [PATCH] More compilation fixes. Enabled -fPIC. --- ediv/src/ediv/build.sh | 4 ++-- ediv/src/encrypt/build.sh | 4 ++-- ediv/src/stub/build.sh | 7 ++----- ediv/src/stub/stub.c | 4 ---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ediv/src/ediv/build.sh b/ediv/src/ediv/build.sh index cd78ac8..27af227 100755 --- a/ediv/src/ediv/build.sh +++ b/ediv/src/ediv/build.sh @@ -1,6 +1,6 @@ #!/bin/bash - -CCOPTS="-I. -I../shared" +DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG" +CCOPTS="-I. -I../shared ${DEBUG} -fPIC" FILES=" edivcfg/dictionary diff --git a/ediv/src/encrypt/build.sh b/ediv/src/encrypt/build.sh index 8c7e857..240c4d8 100755 --- a/ediv/src/encrypt/build.sh +++ b/ediv/src/encrypt/build.sh @@ -1,6 +1,6 @@ #!/bin/bash - -CCOPTS="-I. -I../shared -I/usr/local/include -DDBG" +DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG" +CCOPTS="-I. -I../shared -I/usr/local/include ${DEBUG} -fPIC" FILES=" encrypt diff --git a/ediv/src/stub/build.sh b/ediv/src/stub/build.sh index cd9a287..835329b 100755 --- a/ediv/src/stub/build.sh +++ b/ediv/src/stub/build.sh @@ -1,6 +1,7 @@ #!/bin/bash -CCOPTS="-I. -I../shared -I/usr/local/include -DDBG" +DEBUG="-g -ggdb3 -D_DEBUG -DDBG -DDEBUG" +CCOPTS="-I. -I../shared -I/usr/local/include ${DEBUG} -fPIC" FILES=" dll @@ -23,10 +24,6 @@ for FILE in $FILES; do OBJECTS+="$FILE.o " done -<<<<<<< HEAD -gcc $OBJECTS -o ../../bin/stub -lz -======= gcc $OBJECTS -o ../../bin/stub -lz -ldl ->>>>>>> 6f1419a31008aa9314171e0f90b309fe54da51b0 rm $OBJECTS diff --git a/ediv/src/stub/stub.c b/ediv/src/stub/stub.c index 9bcfd96..80e12cb 100644 --- a/ediv/src/stub/stub.c +++ b/ediv/src/stub/stub.c @@ -20,11 +20,7 @@ #include -<<<<<<< HEAD -#ifndef __APPLE__ -======= #ifdef _WIN32 ->>>>>>> 6f1419a31008aa9314171e0f90b309fe54da51b0 #include #endif