blob: cd5f2086bf31366c6044986c576551735a16e452 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- Makefile.linux_openmp_64 2019-03-08 22:08:10.000000000 +0000
+++ Makefile 2019-03-14 20:49:36.783847110 +0000
@@ -6,7 +6,7 @@
USE_ZLIB = -DHAVE_ZLIB
LZLIB = -lz
USE_GIFTI = -DHAVE_GIFTI
-LGIFTI = /usr/lib64/libexpat.a
+LGIFTI = /usr/lib/libexpat.so
# ------------------------------
# python from C (off for now)
@@ -17,7 +17,7 @@
# X configuration
#
# uncomment to build using local /usr/local/afniX 'X' tree
-USE_LOCAL_X_TREE = 1
+# USE_LOCAL_X_TREE = 1
ifdef USE_LOCAL_X_TREE
XROOT = /usr/local/afniX
XROOT_I = -I$(XROOT)/include
@@ -37,7 +37,7 @@
endif
# in case user wants to override with system dynamic libs
-# XLIBS = -lXm -lXt
+XLIBS = -lXm -lXt
# ----------------------------------------------------------------------
CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
@@ -46,7 +46,8 @@
CC = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
CCVOL = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
CCFAST = /usr/bin/gcc -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
-CCOLD = /usr/bin/gcc -V 34 -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
+#CCOLD = /usr/bin/gcc -V 34 -O2 -m64 -fPIC -DREAD_WRITE_64 -DLINUX2 $(CEXTRA)
+CCOLD = $(CCFAST)
# The following line includes compiling for the SSE operations.
# However, I found that it actually makes things worse in some test code.
@@ -84,7 +85,7 @@
LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
-INSTALLDIR = ./linux_openmp_64
+INSTALLDIR = ../../build
LIBDIR = $(INSTALLDIR)
#INSTALL_PREREQ = suma
|