diff options
Diffstat (limited to 'cad/calculix/files/patch-cgx_VER+src+Makefile')
| -rw-r--r-- | cad/calculix/files/patch-cgx_VER+src+Makefile | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile index 18ab3835c7df..13efc7acb957 100644 --- a/cad/calculix/files/patch-cgx_VER+src+Makefile +++ b/cad/calculix/files/patch-cgx_VER+src+Makefile @@ -1,29 +1,38 @@ ---- cgx_1.1/src/Makefile.orig Tue Aug 5 13:46:07 2003 -+++ cgx_1.1/src/Makefile Thu Aug 7 15:52:48 2003 -@@ -1,12 +1,10 @@ +--- cgx_1.2/src/Makefile.orig Sat Jul 17 17:16:50 2004 ++++ cgx_1.2/src/Makefile Thu Dec 23 15:20:11 2004 +@@ -1,17 +1,16 @@ -CFLAGS = -O2 -Wall \ - -I./ \ - -I/usr/include \ - -I/usr/include/GL \ -- -I/usr/X11R6/include -+CFLAGS += -I./ \ +- -I/usr/local/CalculiX/libSNL/src \ +- -I/usr/X11/include ++CFLAGS += -I./ \ ++ -I%%X11BASE%%/include \ + -I%%X11BASE%%/include/GL \ ++ -I../../libSNL/src \ + -I%%X11BASE%%/include LFLAGS = \ +- -L/usr/local/CalculiX/libSNL/src -lSNL \ - -L/usr/lib -lGL -lGLU -lglut \ -- -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ +- -L/usr/X11/lib -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ ++ -L../../libSNL/src -lSNL \ + -L%%X11BASE%%/lib -lGL -lGLU -lglut \ + -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ -lm - # -lpthread is needed if mesaGL is using threading, otherwhise it is not needed -@@ -114,7 +112,7 @@ +-# -lpthread is needed if mesaGL is using threading, otherwhise it is not needed ++# -lpthread is needed if mesaGL is using threading, otherwise it reduces performance + + SLIB = \ + AsplitA.c \ +@@ -110,7 +109,7 @@ OLIB = $(SLIB:.c=.o) cgx: $(OLIB) - g++ $(OLIB) $(CFLAGS) $(LFLAGS) -o $@ -+ $(CXX) $(OLIB) $(CXXFLAGS) $(LFLAGS) -o $@ - - ++ $(CXX) $(OLIB) $(CFLAGS) $(LFLAGS) -o $@ + # flags for the sgi compiler + # use them with the CC compiler instead of g++ |