aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch')
-rw-r--r--sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch
new file mode 100644
index 000000000..d6e22f9c9
--- /dev/null
+++ b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch
@@ -0,0 +1,73 @@
+diff -uwrN cgx_2.10.ORIG/src/Makefile cgx_2.10/src/Makefile
+--- src/Makefile 2016-01-13 12:41:40.398930000 +0100
++++ cgx_2.10/src/Makefile 2016-03-08 11:02:59.591853482 +0100
+@@ -1,15 +1,15 @@
+-CFLAGS = -O3 -Wall \
++CFLAGS += -Wall \
+ -I./ \
+ -I/usr/include \
+ -I/usr/include/GL \
+ -I../../libSNL/src \
+ -I../../glut-3.5/src \
+- -I/usr/X11/include
++ -I/usr/include/X11
+
+-LFLAGS = \
+- -L/usr/lib64 -lGL -lGLU \
+- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+- -lm -lpthread -lrt
++LFLAGS += \
++ -lGL -lGLU -lglut\
++ -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
++ -lm $(PTHREAD) -lrt
+
+
+ # on 32bit systems change lib64 to lib
+@@ -22,41 +22,6 @@
+ userFunction.c
+
+ SUTIL = \
+- ../../glut-3.5/src/layerutil.c \
+- ../../glut-3.5/src/glut_dials.c \
+- ../../glut-3.5/src/glut_ext.c \
+- ../../glut-3.5/src/glut_mesa.c \
+- ../../glut-3.5/src/glut_menu.c \
+- ../../glut-3.5/src/glut_modifier.c \
+- ../../glut-3.5/src/glut_space.c \
+- ../../glut-3.5/src/glut_shapes.c \
+- ../../glut-3.5/src/glut_tablet.c \
+- ../../glut-3.5/src/glut_warp.c \
+- ../../glut-3.5/src/glut_8x13.c \
+- ../../glut-3.5/src/glut_9x15.c \
+- ../../glut-3.5/src/glut_hel10.c \
+- ../../glut-3.5/src/glut_hel18.c \
+- ../../glut-3.5/src/glut_hel12.c \
+- ../../glut-3.5/src/glut_tr10.c \
+- ../../glut-3.5/src/glut_tr24.c \
+- ../../glut-3.5/src/glut_bitmap.c \
+- ../../glut-3.5/src/glut_cursor.c \
+- ../../glut-3.5/src/glut_event.c \
+- ../../glut-3.5/src/glut_get.c \
+- ../../glut-3.5/src/glut_overlay.c \
+- ../../glut-3.5/src/glut_input.c \
+- ../../glut-3.5/src/glut_stroke.c \
+- ../../glut-3.5/src/glut_teapot.c \
+- ../../glut-3.5/src/glut_winmisc.c \
+- ../../glut-3.5/src/glut_fullscrn.c \
+- ../../glut-3.5/src/glut_cindex.c \
+- ../../glut-3.5/src/glut_roman.c \
+- ../../glut-3.5/src/glut_mroman.c \
+- ../../glut-3.5/src/glut_swidth.c \
+- ../../glut-3.5/src/glut_bwidth.c \
+- ../../glut-3.5/src/glut_win.c \
+- ../../glut-3.5/src/glut_init.c \
+- ../../glut-3.5/src/glut_util.c \
+ uselibSNL.cpp \
+ generateTet.cpp \
+ ../../libSNL/src/*.cpp
+@@ -66,7 +31,7 @@
+ OUTIL = $(SUTIL:.c=.o)
+
+ cgx: $(OLIB) $(OUTIL) $(OULIB)
+- g++ $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
++ $(CXX) $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@