Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27977/libstage
Modified Files:
Makefile Makefile.am
Log Message:
added M4 code to find opengl portably
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am 23 Feb 2008 05:22:54 -0000 1.7
--- Makefile.am 24 Feb 2008 20:13:57 -0000 1.8
***************
*** 14,18 ****
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace @PIXBUF_CFLAGS@
@FLTK_CFLAGS@ -DRGBFILE=\"$(RGB)\"
# build the stage library and program
--- 14,18 ----
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace @GLU_CFLAGS@ @PIXBUF_CFLAGS@
@FLTK_CFLAGS@ -DRGBFILE=\"$(RGB)\"
# build the stage library and program
***************
*** 46,50 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl -lGLU
# STAGE
--- 46,50 ----
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ @GLU_LIBS@ -lltdl
# STAGE
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile 23 Feb 2008 05:22:54 -0000 1.13
--- Makefile 24 Feb 2008 20:13:57 -0000 1.14
***************
*** 137,140 ****
--- 137,144 ----
FLTK_CFLAGS = -I/usr/include/freetype2
FLTK_LIBS = -lfltk_images -lfltk_gl -lfltk
+ GLU_CFLAGS = -pthread
+ GLU_LIBS = -lGLU -lGL -lm
+ GL_CFLAGS = -pthread
+ GL_LIBS = -lGL -lm
GREP = /bin/grep
HAVE_FLTK_CONFIG = fltk-config
***************
*** 168,171 ****
--- 172,178 ----
PLAYER_CFLAGS =
PLAYER_LIBS =
+ PTHREAD_CC = gcc
+ PTHREAD_CFLAGS = -pthread
+ PTHREAD_LIBS =
RANLIB = ranlib
SED = /bin/sed
***************
*** 174,177 ****
--- 181,185 ----
STRIP = strip
VERSION = 3.0.0
+ XMKMF =
abs_builddir = /home/vaughan/PS/HEAD/stage/libstage
abs_srcdir = /home/vaughan/PS/HEAD/stage/libstage
***************
*** 181,184 ****
--- 189,193 ----
ac_ct_CXX = g++
ac_ct_F77 =
+ acx_pthread_config =
am__include = include
am__leading_dot = .
***************
*** 216,220 ****
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /home/vaughan/PS-2
program_transform_name = s,x,x,
psdir = ${docdir}
--- 225,229 ----
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /home/vaughan/PS-2/
program_transform_name = s,x,x,
psdir = ${docdir}
***************
*** 239,243 ****
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/usr/include/gtk-2.0
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2
-DRGBFILE=\"$(RGB)\"
# build the stage library and program
--- 248,252 ----
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -pthread
-I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-I/usr/include/freetype2 -DRGBFILE=\"$(RGB)\"
# build the stage library and program
***************
*** 269,273 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0 -lfltk_images -lfltk_gl -lfltk -lltdl -lGLU
# STAGE
--- 278,282 ----
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0 -lfltk_images -lfltk_gl -lfltk -lGLU -lGL -lm -lltdl
# STAGE
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
