1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
freebsd-ports/astro/xglobe/files/patch-aa
Pav Lucistnik 5ca9a6aed0 - Remove QTDIR from CONFIGURE_ENV, it's in there already thanks to framework
Submitted by:	rafan
Tested on:	pointyhat
2007-02-13 00:16:29 +00:00

60 lines
1.6 KiB
Plaintext

--- Makefile.orig Mon Jul 19 14:56:27 1999
+++ Makefile Sat Jan 25 14:51:03 2003
@@ -4,29 +4,30 @@
####### Installation directory
-XGLOBE_DIR = /usr/local
-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe
+XGLOBE_DIR = $(PREFIX)
+XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe
XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin
####### Library directories - you may need to modify these
-X11_INCLUDE_DIR = /usr/X11R6/include
-QT_INCLUDE_DIR = $(QTDIR)/include
+X11_INCLUDE_DIR = $(X11BASE)/include
+QT_INCLUDE_DIR = $(QT_PREFIX)/include/
-QT_LIB_DIR = $(QTDIR)/lib
-X11_LIB_DIR = /usr/X11R6/lib
+QT_LIB_DIR = $(QT_PREFIX)/lib
+X11_LIB_DIR = $(X11BASE)/lib
####### Compiler and tools
-CPP = g++
-LINK = g++
+CXX ?= c++
+CPP = ${CXX}
+LINK = ${CXX}
MOC = moc
INSTALL = install
####### compile and link options
-CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall
+CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO)
LFLAGS =
@@ -34,13 +35,13 @@
LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
-LIBS = -lX11 -lqt -lm
+LIBS = -lX11 -lqt-mt -lm ${PTHREAD_LIBS}
# If you want to use the QImageIO lib (to support jpg and png maps) use the
# next two lines and comment the one above
#WITH_QIMGIO = -DWITH_QIMAGEIO
-#LIBS = -lX11 -lqt -lm -lqimgio
+#LIBS = -lX11 -lqt1 -lm -lqimgio
# If the linker complains about unresolved references try this:
-#LIBS = -lX11 -lqt -lm -lqimgio -lpng -lz -ljpeg
+#LIBS = -lX11 -lqt1 -lm -lqimgio -lpng -lz -ljpeg
####### Target