Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7267/libstage
Modified Files:
Makefile Makefile.am stage.hh
Log Message:
attempting to work around OS X GL strangeness
Index: stage.hh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/stage.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** stage.hh 23 Feb 2008 05:22:54 -0000 1.10
--- stage.hh 24 Feb 2008 20:46:13 -0000 1.11
***************
*** 72,78 ****
#include <FL/gl.h> // FLTK takes care of platform-specific GL stuff
#include <FL/glut.H>
- //#include <FL/glut.h>
-
- //#include <FL/glu.h>
#ifdef __APPLE__
--- 72,75 ----
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am 24 Feb 2008 20:13:57 -0000 1.8
--- Makefile.am 24 Feb 2008 20:46:13 -0000 1.9
***************
*** 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
--- 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
***************
*** 46,50 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ @GLU_LIBS@ -lltdl
# STAGE
--- 46,57 ----
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl
!
! if DARWIN
! libstage_la_LIBADD +=
! else
! libstage_la_LIBADD += -lGLU
! endif
!
# STAGE
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile 24 Feb 2008 20:13:57 -0000 1.14
--- Makefile 24 Feb 2008 20:46:13 -0000 1.15
***************
*** 43,46 ****
--- 43,48 ----
target_triplet = i686-pc-linux-gnu
bin_PROGRAMS = stage$(EXEEXT)
+ #am__append_1 =
+ am__append_2 = -lGLU
subdir = libstage
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
***************
*** 64,68 ****
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
! libstage_la_DEPENDENCIES =
am_libstage_la_OBJECTS = ancestor.lo block.lo canvas.lo gl.lo \
glcolorstack.lo model.lo model_callbacks.lo model_fiducial.lo \
--- 66,71 ----
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
! am__DEPENDENCIES_1 =
! libstage_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libstage_la_OBJECTS = ancestor.lo block.lo canvas.lo gl.lo \
glcolorstack.lo model.lo model_callbacks.lo model_fiducial.lo \
***************
*** 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
--- 140,143 ----
***************
*** 172,178 ****
PLAYER_CFLAGS =
PLAYER_LIBS =
- PTHREAD_CC = gcc
- PTHREAD_CFLAGS = -pthread
- PTHREAD_LIBS =
RANLIB = ranlib
SED = /bin/sed
--- 171,174 ----
***************
*** 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
--- 177,180 ----
***************
*** 189,193 ****
ac_ct_CXX = g++
ac_ct_F77 =
- acx_pthread_config =
am__include = include
am__leading_dot = .
--- 184,187 ----
***************
*** 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
--- 242,246 ----
# 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
***************
*** 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
--- 272,277 ----
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 $(am__append_1) \
! $(am__append_2)
# 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
