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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile
--- CalculiX_orig/ccx_2.16/src/Makefile
+++ CalculiX/ccx_2.16/src/Makefile
@@ -2,2 +2,2 @@
-CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+CFLAGS = -Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
FFLAGS = -Wall -O2
@@ -21,6 +21,1 @@
-DIR=../../../SPOOLES.2.2
-
-LIBS = \
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack
diff -ur CalculiX_orig/cgx_2.16.1/src/Makefile CalculiX/cgx_2.16/src/Makefile
--- CalculiX_orig/cgx_2.16-1/src/Makefile
+++ CalculiX/cgx_2.16.1/src/Makefile
@@ -1,14 +1,8 @@
CFLAGS = -O3 -Wall \
-I./ \
- -I/usr/include \
- -I/usr/include/GL \
- -I../../libSNL/src \
- -I../../glut-3.5/src \
- -I/usr/X11/include
+ -I/usr/include/libSNL \
+ -I../../glut-3.5/src
-LFLAGS = \
- -L/usr/lib64 -lGL -lGLU \
- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
- -lm -lpthread -lrt
+LFLAGS = -lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt
@@ -59,1 +53,1 @@
- ../../libSNL/src/*.cpp
+# ../../libSNL/src/*.cpp
diff -ur CalculiX_orig/cgx_2.16.1/src/cgx.h CalculiX/cgx_2.16/src/cgx.h
--- CalculiX_orig/cgx_2.16.1/src/cgx.h
+++ CalculiX/cgx_2.16.1/src/cgx.h
@@ -81,8 +81,8 @@
#elif defined AFLIB
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
- "/usr/local/CalculiX/cgx_2.8/doc/aflib/aflib.pdf"}
+ #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\
+ "/usr/share/doc/doc/ccx/ccx.html",\
+ "/usr/share/doc/doc/aflib/aflib.pdf"}
#else
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html"}
+ #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\
+ "/usr/share/doc/ccx/ccx.html"}
#endif
diff -ur CalculiX_orig/cgx_2.16.1/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h
--- CalculiX_orig/cgx_2.16.1/src/uselibSNL.h
+++ CalculiX/cgx_2.16.1/src/uselibSNL.h
@@ -8,1 +8,3 @@
#include <cgx.h>
+#undef max
+#undef min
|