Attachment #16055 for bug #29599

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

Lines 21-27 Link Here

(-)wmanager/Makefile (-1 / +3 lines)
21	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
22	USE_QT_VER= 1	22	USE_QT_VER= 1
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	MAKE_ENV= prefix=${PREFIX}	24	MAKE_ENV= prefix=${PREFIX} \
		25	PTHREAD_LIBS="${PTHREAD_LIBS}" \
		26	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
25		27
26	do-install:	28	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin	29	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin




-CXXFLAGS  = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
-
+CXX	= g++ 
+CXXFLAGS+= -I$(fltkinc) -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 ${PTHREAD_CFLAGS}
 
 # linker settings
 LD        = g++
-LDFLAGS   = -lfltk -lXext -lX11 -lm
-LDDIRS    = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
-
+LDFLAGS   = -lMesaGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
+LDDIRS    = -L$(x11lib) -L/usr/lib -L/usr/local/lib
 
 # install settings

Return to bug 29599

Lines 22-35 Link Here

(-)wmanager/files/patch-aa (-2 / +2 lines)
22	-CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3	22	-CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
23	-	23	-
24	+CXX = g++	24	+CXX = g++
25	+CXXFLAGS= -I$(fltkinc) -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3	25	+CXXFLAGS+= -I$(fltkinc) -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 ${PTHREAD_CFLAGS}
26		26
27	# linker settings	27	# linker settings
28	LD = g++	28	LD = g++
29	-LDFLAGS = -lfltk -lXext -lX11 -lm	29	-LDFLAGS = -lfltk -lXext -lX11 -lm
30	-LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib	30	-LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
31	-	31	-
32	+LDFLAGS = -lMesaGL -lfltk -lXext -lX11 -lm	32	+LDFLAGS = -lMesaGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
33	+LDDIRS = -L$(x11lib) -L/usr/lib -L/usr/local/lib	33	+LDDIRS = -L$(x11lib) -L/usr/lib -L/usr/local/lib
34		34
35	# install settings	35	# install settings