Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14644/libstage
Modified Files:
Makefile Makefile.am stage.hh
Log Message:
fixed opengl build on Linux
Index: stage.hh
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/stage.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** stage.hh 21 Feb 2008 23:40:13 -0000 1.9
--- stage.hh 23 Feb 2008 05:22:54 -0000 1.10
***************
*** 72,76 ****
#include <FL/gl.h> // FLTK takes care of platform-specific GL stuff
#include <FL/glut.H>
! #include <FL/glut.h>
//#include <FL/glu.h>
--- 72,76 ----
#include <FL/gl.h> // FLTK takes care of platform-specific GL stuff
#include <FL/glut.H>
! //#include <FL/glut.h>
//#include <FL/glu.h>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am 22 Feb 2008 21:20:47 -0000 1.6
--- Makefile.am 23 Feb 2008 05:22:54 -0000 1.7
***************
*** 46,50 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl
# STAGE
--- 46,50 ----
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = @PIXBUF_LIBS@ @FLTK_LIBS@ -lltdl -lGLU
# STAGE
Index: Makefile
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile 22 Feb 2008 21:20:47 -0000 1.12
--- Makefile 23 Feb 2008 05:22:54 -0000 1.13
***************
*** 39,45 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i386-apple-darwin9.2.0
! host_triplet = i386-apple-darwin9.2.0
! target_triplet = i386-apple-darwin9.2.0
bin_PROGRAMS = stage$(EXEEXT)
subdir = libstage
--- 39,45 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! build_triplet = i686-pc-linux-gnu
! host_triplet = i686-pc-linux-gnu
! target_triplet = i686-pc-linux-gnu
bin_PROGRAMS = stage$(EXEEXT)
subdir = libstage
***************
*** 108,118 ****
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run aclocal-1.10
! AMTAR = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run tar
AR = ar
! AUTOCONF = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run autoconf
! AUTOHEADER = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run autoheader
! AUTOMAKE = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run automake-1.10
! AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
--- 108,118 ----
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! ACLOCAL = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run aclocal-1.10
! AMTAR = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run tar
AR = ar
! AUTOCONF = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run autoconf
! AUTOHEADER = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run autoheader
! AUTOMAKE = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run automake-1.10
! AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
***************
*** 127,143 ****
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
! ECHO = /bin/echo
! ECHO_C = \c
! ECHO_N =
ECHO_T =
! EGREP = /usr/bin/grep -E
EXEEXT =
F77 =
FFLAGS =
! FLTK_CFLAGS = -I/opt/local/include -I/opt/local/include/FL/images
! FLTK_LIBS = -L/opt/local/lib -lfltk_images -lfltk_png -lz -lfltk_jpeg
-lfltk_gl -framework AGL -framework OpenGL -lfltk -framework Carbon -framework
ApplicationServices
! GREP = /usr/bin/grep
HAVE_FLTK_CONFIG = fltk-config
! INSTALL = /opt/local/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
--- 127,143 ----
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
! ECHO = echo
! ECHO_C =
! ECHO_N = -n
ECHO_T =
! EGREP = /bin/grep -E
EXEEXT =
F77 =
FFLAGS =
! FLTK_CFLAGS = -I/usr/include/freetype2
! FLTK_LIBS = -lfltk_images -lfltk_gl -lfltk
! GREP = /bin/grep
HAVE_FLTK_CONFIG = fltk-config
! INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
***************
*** 151,156 ****
LN_S = ln -s
LTLIBOBJS =
! MAKEINFO = ${SHELL} /Users/vaughan/PS/HEAD/stage/missing --run makeinfo
! MKDIR_P = /opt/local/bin/gmkdir -p
OBJEXT = o
PACKAGE = stage
--- 151,156 ----
LN_S = ln -s
LTLIBOBJS =
! MAKEINFO = ${SHELL} /home/vaughan/PS/HEAD/stage/missing --run makeinfo
! MKDIR_P = /bin/mkdir -p
OBJEXT = o
PACKAGE = stage
***************
*** 161,180 ****
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PIXBUF_CFLAGS = -I/opt/local/include/gtk-2.0 -I/opt/local/include/glib-2.0
-I/opt/local/lib/glib-2.0/include -I/opt/local/include
! PIXBUF_LIBS = -L/opt/local/lib -lgdk_pixbuf-2.0 -lgobject-2.0 -lgmodule-2.0
-lglib-2.0 -lintl -liconv
! PKG_CONFIG = /opt/local/bin/pkg-config
! PLAYERC_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.1
! PLAYERC_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayerc -lm -lplayerxdr
-lplayererror
! PLAYER_CFLAGS = -I/Users/vaughan/PS-2.0/include/player-2.1
! PLAYER_LIBS = -L/Users/vaughan/PS-2.0/lib -lplayercore -lltdl -lpthread
-lplayererror
RANLIB = ranlib
SET_MAKE =
! SHELL = /bin/sh
STRIP = strip
VERSION = 3.0.0
! abs_builddir = /Users/vaughan/PS/HEAD/stage/libstage
! abs_srcdir = /Users/vaughan/PS/HEAD/stage/libstage
! abs_top_builddir = /Users/vaughan/PS/HEAD/stage
! abs_top_srcdir = /Users/vaughan/PS/HEAD/stage
ac_ct_CC = gcc
ac_ct_CXX = g++
--- 161,181 ----
PACKAGE_VERSION = 3.0.0
PATH_SEPARATOR = :
! PIXBUF_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include
! PIXBUF_LIBS = -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0
! PKG_CONFIG = /usr/bin/pkg-config
! PLAYERC_CFLAGS =
! PLAYERC_LIBS =
! PLAYER_CFLAGS =
! PLAYER_LIBS =
RANLIB = ranlib
+ SED = /bin/sed
SET_MAKE =
! SHELL = /bin/bash
STRIP = strip
VERSION = 3.0.0
! abs_builddir = /home/vaughan/PS/HEAD/stage/libstage
! abs_srcdir = /home/vaughan/PS/HEAD/stage/libstage
! abs_top_builddir = /home/vaughan/PS/HEAD/stage
! abs_top_srcdir = /home/vaughan/PS/HEAD/stage
ac_ct_CC = gcc
ac_ct_CXX = g++
***************
*** 186,194 ****
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i386-apple-darwin9.2.0
build_alias =
! build_cpu = i386
! build_os = darwin9.2.0
! build_vendor = apple
builddir = .
datadir = ${datarootdir}
--- 187,195 ----
am__untar = tar -xf -
bindir = ${exec_prefix}/bin
! build = i686-pc-linux-gnu
build_alias =
! build_cpu = i686
! build_os = linux-gnu
! build_vendor = pc
builddir = .
datadir = ${datarootdir}
***************
*** 198,210 ****
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i386-apple-darwin9.2.0
host_alias =
! host_cpu = i386
! host_os = darwin9.2.0
! host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
! install_sh = $(SHELL) /Users/vaughan/PS/HEAD/stage/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
--- 199,211 ----
exec_prefix = ${prefix}
have_pkg_config = yes
! host = i686-pc-linux-gnu
host_alias =
! host_cpu = i686
! host_os = linux-gnu
! host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
! install_sh = $(SHELL) /home/vaughan/PS/HEAD/stage/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
***************
*** 212,219 ****
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
! mkdir_p = /opt/local/bin/gmkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /Users/vaughan/PS-2.0
program_transform_name = s,x,x,
psdir = ${docdir}
--- 213,220 ----
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
! mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
! prefix = /home/vaughan/PS-2
program_transform_name = s,x,x,
psdir = ${docdir}
***************
*** 222,230 ****
srcdir = .
sysconfdir = ${prefix}/etc
! target = i386-apple-darwin9.2.0
target_alias =
! target_cpu = i386
! target_os = darwin9.2.0
! target_vendor = apple
top_builddir = ..
top_srcdir = ..
--- 223,231 ----
srcdir = .
sysconfdir = ${prefix}/etc
! target = i686-pc-linux-gnu
target_alias =
! target_cpu = i686
! target_os = linux-gnu
! target_vendor = pc
top_builddir = ..
top_srcdir = ..
***************
*** 238,242 ****
# system-wide compile flags - target-specific flags are added to each target
below
! AM_CPPFLAGS = -Wall -I. -I$(top_srcdir)/replace -I/opt/local/include/gtk-2.0
-I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include
-I/opt/local/include -I/opt/local/include -I/opt/local/include/FL/images
-DRGBFILE=\"$(RGB)\"
# build the stage library and program
--- 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
***************
*** 268,272 ****
libstage_la_LDFLAGS = -version-info 3:1:0 -rpath $(libdir)
! libstage_la_LIBADD = -L/opt/local/lib -lgdk_pixbuf-2.0 -lgobject-2.0
-lgmodule-2.0 -lglib-2.0 -lintl -liconv -L/opt/local/lib -lfltk_images
-lfltk_png -lz -lfltk_jpeg -lfltk_gl -framework AGL -framework OpenGL -lfltk
-framework Carbon -framework ApplicationServices -lltdl
# STAGE
--- 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
-------------------------------------------------------------------------
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
