[Playerstage-commit] code/stage stage_logo.png, NONE, 1.1.2.1 Makefile.am, 1.37, 1.37.6.1 configure.ac, 1.13.2.3, 1.13.2.4 stage.xpm, 1.1, NONE

[Richard Vaughan]

Update of /cvsroot/playerstage/code/stage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9636

Modified Files:
      Tag: opengl
        Makefile.am configure.ac 
Added Files:
      Tag: opengl
        stage_logo.png 
Removed Files:
      Tag: opengl
        stage.xpm 
Log Message:
major rewite in C++ for Stage-3.0.0

Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/stage/configure.ac,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -d -r1.13.2.3 -r1.13.2.4
*** configure.ac        21 Jun 2007 01:47:31 -0000      1.13.2.3
--- configure.ac        4 Oct 2007 01:17:02 -0000       1.13.2.4
***************
*** 5,11 ****
  
  dnl AC_INIT( package, version )
! AC_INIT(stage,3.0.0)
! 
! AC_CONFIG_SRCDIR(src/stage.c)
  
  dnl determine system type.  this is used in a couple of places to infer the 
--- 5,13 ----
  
  dnl AC_INIT( package, version )
! AC_INIT(Stage,3.0.0)  
!                       
! dnl Check for a source file, to make sure any user-specified source
! dnl dir is correct            
! AC_CONFIG_SRCDIR(libstage/model.cc)
  
  dnl determine system type.  this is used in a couple of places to infer the 
***************
*** 72,100 ****
  dnl ==== GUI/GRAPHICS ====
  
! dnl gtkglext brings in all dependencies on GTK, glib, etc. Almost too easy!
  PKG_CHECK_MODULES(GUI, gtkglext-1.0 >= 1.0, , 
   AC_MSG_ERROR([Required library GtkGLExt not found. Install it and try 
again.]) 
  )
  
- dnl TODO - use Reed Hedges' MobileSim patch to improve on this
- dnl where's the X11 color database?
- AC_CHECK_FILE([/usr/X11R6/lib/X11/rgb.txt],
-   CDB="\"/usr/X11R6/lib/X11/rgb.txt\"",
-   AC_CHECK_FILE([/usr/openwin/lib/X11/rgb.txt],
-     CDB="\"/usr/openwin/lib/X11/rgb.txt\"",
-     CDB="\"/usr/X11R6/lib/X11/rgb.txt\""))
- AC_ARG_WITH(color, [   --with-color=file      Location of X11-style color 
file],
- CDB="\"$with_color\"",)
- AC_DEFINE_UNQUOTED(COLOR_DATABASE,$CDB,[the X11-style color database])
- 
  dnl ==== FINISH UP =====
  
  AC_OUTPUT(Makefile 
!           src/Makefile 
          docsrc/Makefile
            worlds/Makefile 
            worlds/bitmaps/Makefile 
            replace/Makefile
-           src/referees/Makefile
          stage.pc )
  
--- 74,92 ----
  dnl ==== GUI/GRAPHICS ====
  
! dnl GTK+ with OpenGL: gtkglext brings in all dependencies on GTK,
! dnl glib, etc. Almost too easy!
  PKG_CHECK_MODULES(GUI, gtkglext-1.0 >= 1.0, , 
   AC_MSG_ERROR([Required library GtkGLExt not found. Install it and try 
again.]) 
  )
  
  dnl ==== FINISH UP =====
  
  AC_OUTPUT(Makefile 
!           libstage/Makefile 
!           libstageplugin/Makefile 
          docsrc/Makefile
            worlds/Makefile 
            worlds/bitmaps/Makefile 
            replace/Makefile
          stage.pc )
  
***************
*** 105,109 ****
  AC_MSG_RESULT([])
  AC_MSG_RESULT([Stage will be built for a $host system, with the following 
tools and options:])
- AC_MSG_RESULT([  C   compiler: $CC $CFLAGS ])
  AC_MSG_RESULT([  C++ compiler: $CXX $CXXFLAGS ])
  AC_MSG_RESULT([])
--- 97,100 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.37.6.1
diff -C2 -d -r1.37 -r1.37.6.1
*** Makefile.am 9 Aug 2005 05:10:26 -0000       1.37
--- Makefile.am 4 Oct 2007 01:17:02 -0000       1.37.6.1
***************
*** 1,3 ****
! SUBDIRS = replace src worlds docsrc
  
  # create the pkg-config entries
--- 1,3 ----
! SUBDIRS = replace libstage libstageplugin worlds docsrc
  
  # create the pkg-config entries

--- stage.xpm DELETED ---

--- NEW FILE: stage_logo.png ---
(This appears to be a binary file; contents omitted.)


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit