diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2012-11-13 21:52:37 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2012-11-13 21:52:37 +0000 |
commit | 83b0812716a433454284e8ab0c0aeede1d1f6517 (patch) | |
tree | 6cfefb4f577df9beb294d299201a00de92d26a8c /math/k3dsurf/files/patch-src_Makefile | |
parent | - Convert to new format Makefile header (diff) |
Upgrade to 0.6.2.4.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307398
Diffstat (limited to 'math/k3dsurf/files/patch-src_Makefile')
-rw-r--r-- | math/k3dsurf/files/patch-src_Makefile | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/math/k3dsurf/files/patch-src_Makefile b/math/k3dsurf/files/patch-src_Makefile new file mode 100644 index 000000000000..647251d6270a --- /dev/null +++ b/math/k3dsurf/files/patch-src_Makefile @@ -0,0 +1,43 @@ +--- src/Makefile.orig 2009-05-24 17:52:07.000000000 +0200 ++++ src/Makefile 2012-11-13 22:29:38.000000000 +0100 +@@ -8,22 +8,22 @@ + + ####### Compiler, tools and options + +-CC = gcc +-CXX = g++ ++#CC = gcc ++#CXX = g++ + LEX = flex + YACC = yacc +-CFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT +-CXXFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT ++CFLAGS += -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT ++CXXFLAGS += -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT + LEXFLAGS = + YACCFLAGS= -d +-INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I/usr/include/qt3 -I/usr/X11R6/include -I/usr/X11R6/include +-LINK = g++ ++INCPATH = -I. -I$(QTDIR)/include ++LINK = $(CXX) + LFLAGS = +-LIBS = $(SUBLIBS) -L/usr/share/qt3/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lpthread ++LIBS = $(SUBLIBS) -L/$(QTDIR)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm $(PTHREAD_LIBS) + AR = ar cqs + RANLIB = +-MOC = /usr/share/qt3/bin/moc +-UIC = /usr/share/qt3/bin/uic ++MOC = $(LOCALBASE)/bin/moc ++UIC = $(LOCALBASE)/bin/uic + QMAKE = qmake + TAR = tar -cf + GZIP = gzip -9f +@@ -201,7 +201,7 @@ + $(MOC): + ( cd $(QTDIR)/src/moc && $(MAKE) ) + +-Makefile: src.pro /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl ++Makefile: src.pro + $(QMAKE) -o Makefile src.pro + qmake: + @$(QMAKE) -o Makefile src.pro |