Attachment #15087 for bug #28073

View | Details | Raw Unified | Return to bug 28073
Collapse All | Expand All

Lines 18-23 Link Here

(-)glclock/Makefile (+1 lines)
18	USE_MESA= yes	18	USE_MESA= yes
19	MAKEFILE= makefile	19	MAKEFILE= makefile
20	ALL_TARGET= glclock	20	ALL_TARGET= glclock
		21	MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
21		22
22	SCRIPTS = benchclock crystalclock f_crystalclock f_glclock \	23	SCRIPTS = benchclock crystalclock f_crystalclock f_glclock \
23	f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock \	24	f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock \




 
-           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm
+   INCLUDE_PATH = -I${X11BASE}/include
+       LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib
+
+# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.
+# (see http://people.FreeBSD.org/~3d)
+           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
 
 #                 for Mesa
 #          LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm
 
-         CFLAGS = -c
+         CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ${PTHREAD_CFLAGS}
          LFLAGS =
 
-COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)

Return to bug 28073

Lines 18-34 Link Here

(-)glclock/files/patch-aa (-3 / +3 lines)
18		18
19	- LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm	19	- LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm
20	+ INCLUDE_PATH = -I${X11BASE}/include	20	+ INCLUDE_PATH = -I${X11BASE}/include
21	+ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib	21	+ LIB_PATH = -L${X11BASE}/lib -Wl,-rpath,/usr/X11R6/lib
22	+	22	+
23	+# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.	23	+# Link with -lGL on FreeBSD so we use hardware-accelerated GL, when installed.
24	+# (see http://people.FreeBSD.org/~3d)	24	+# (see http://people.FreeBSD.org/~3d)
25	+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi	25	+ LIBS = -lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
26		26
27	# for Mesa	27	# for Mesa
28	# LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm	28	# LIBS = -lglut -lMesatk -lMesaGLU -lMesaGL -lXi -lXext -lXmu -lX11 -lm
29		29
30	- CFLAGS = -c	30	- CFLAGS = -c
31	+ CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\"	31	+ CFLAGS += -w -DGLCLOCK_DIR=\"${GLCLOCK_DIR}\" ${PTHREAD_CFLAGS}
32	LFLAGS =	32	LFLAGS =
33		33
34	-COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)	34	-COMPILE = $(CC) $(CFLAGS) $(OPT) $(INCLUDE_PATH)