diff options
Diffstat (limited to 'cad/calculix/files/patch-cgx_VER+src+Makefile')
| -rw-r--r-- | cad/calculix/files/patch-cgx_VER+src+Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile index 3f4bfbd51f3b..7039583b1155 100644 --- a/cad/calculix/files/patch-cgx_VER+src+Makefile +++ b/cad/calculix/files/patch-cgx_VER+src+Makefile @@ -1,7 +1,8 @@ ---- cgx_1.4/src/Makefile.orig Tue Sep 13 02:24:07 2005 -+++ cgx_1.4/src/Makefile Sun Nov 6 22:42:56 2005 +--- cgx_1.5/src/Makefile.orig Sun Feb 19 22:13:12 2006 ++++ cgx_1.5/src/Makefile Sun Feb 19 22:20:42 2006 @@ -1,13 +1,13 @@ - CFLAGS = -O2 -Wall \ +-CFLAGS = -O2 -Wall \ ++CFLAGS += -O2 -Wall \ -I./ \ -I/usr/include \ - -I/usr/include/GL \ @@ -10,15 +11,16 @@ - -I/usr/X11/include + -I%%X11BASE%%/include - LFLAGS = \ +-LFLAGS = \ - -L/usr/lib -lGL -lGLU -lglut \ - -L/usr/X11/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ ++LFLAGS += \ + -L%%X11BASE%%/lib -lGL -lGLU -lglut \ -+ -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ ++ -L%%X11BASE%%/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ -lm # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ -@@ -118,42 +118,6 @@ +@@ -115,42 +115,6 @@ write2nas.c \ write2tochnog.c \ writefbd.c \ @@ -61,12 +63,12 @@ uselibSNL.cpp \ ../../libSNL/src/*.cpp -@@ -161,7 +125,7 @@ +@@ -158,7 +122,7 @@ OLIB = $(SLIB:.c=.o) cgx: $(OLIB) - g++ $(OLIB) $(CFLAGS) $(LFLAGS) -o $@ -+ $(CXX) $(OLIB) $(CFLAGS) $(LFLAGS) -o $@ ++ ${CXX} $(OLIB) $(CFLAGS) $(LFLAGS) -o $@ |