[paragui-cvs] CVS: paragui TODO,1.1.1.1.2.4,1.1.1.1.2.5 configure.in,1.8.2.3,1.8.2.4

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui
In directory subversions:/tmp/cvs-serv1777

Modified Files:
      Tag: devel-opengl
        TODO configure.in 
Log Message:
first operational opengl version - tag "gotta start somewhere"
also removed -most- of debug code - or at least commented it out.


Index: TODO
===================================================================
RCS file: /cvsroot/paragui/paragui/TODO,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** TODO        26 Jun 2002 08:47:51 -0000      1.1.1.1.2.4
--- TODO        12 Sep 2002 06:38:49 -0000      1.1.1.1.2.5
***************
*** 1,26 ****
  Update me :))
  
! Teunis Peters
!        ! remember that when you have seperate binary tree that the data is
!                NOT copied over (*.xml and *.bmp from test)
         ! all my debug code still present
-        - rewritten display management for modularity
         - now dependant on glSDL (provided with source as LGPL allows :)
         OpenGL preparation issues:
                src/draw/: - remove SDL dependancies
                                stretch
-               weird font probs in:  (more precisely, animation works :)
-                     (fonts show up as '0' only)
-                     dropdown, layouttest, dblbuffer, listbox, navtest,
-                     tabbar, windowresize
-                     the first display in windowtest has no font (all '0')
-                     but the second works.
-                       - Traced to bug in freetype; workaround added.
                identify crashes in:
!                       windowtest - depth != 0 in SDL_CreateRGBSurface DONE
!                       paratest - crashes on startup.
!                                - crashes on finish in framebuffer mode
                        dblbuffer
                           (no display, no mouse cursor; note that SDL_Flip() 
sorta works)
                current problems:
                        - no mouse cursor - SOLVED - was a zero-width/height 
rectangle
--- 1,21 ----
  Update me :))
  
! Teunis Peters - current TODO:
!       ! SDL_image required?  the fallback (in src/core/pgfilearchive.cpp)
!               crashes... but when SDL_image is installed it works.  Note that
!               configure.in now detects SDL_image properly :)
         ! all my debug code still present
         - now dependant on glSDL (provided with source as LGPL allows :)
+               ! fixme - remove glSDL, it's not really that useful here...
+ 
         OpenGL preparation issues:
                src/draw/: - remove SDL dependancies
                                stretch
                identify crashes in:
!                       paratest, stress1, stress2 - crashes on finish
!                       tabbar - crashes on start
                        dblbuffer
                           (no display, no mouse cursor; note that SDL_Flip() 
sorta works)
+                               - I'd really like this solved :)
                current problems:
                        - no mouse cursor - SOLVED - was a zero-width/height 
rectangle

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** configure.in        31 Aug 2002 04:01:21 -0000      1.8.2.3
--- configure.in        12 Sep 2002 06:38:49 -0000      1.8.2.4
***************
*** 14,17 ****
--- 14,21 ----
  PKG_SIGC="sigc++-1.2"
  
+ dnl libSigCxx current version
+ SIGCX_VERSION=0.5.2
+ PKG_SIGCX="sigcx"
+ 
  dnl Set various version strings - taken gratefully from the GTk sources
  
***************
*** 213,221 ****
  
  dnl Check for libSigC++
- 
  PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
  AC_SUBST(SIGC_CFLAGS)
  AC_SUBST(SIGC_LIBS)
  
  
  dnl Check for SDL
--- 217,229 ----
  
  dnl Check for libSigC++
  PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
  AC_SUBST(SIGC_CFLAGS)
  AC_SUBST(SIGC_LIBS)
  
+ dnl Check for libSigCxx
+ PKG_CHECK_MODULES(SIGCX, $PKG_SIGCX >= $SIGCX_VERSION)
+ AC_SUBST(SIGCX_CFLAGS)
+ AC_SUBST(SIGCX_LIBS)
+ 
  
  dnl Check for SDL
***************
*** 511,519 ****
  
  have_SDL_image=no
! AC_CHECK_LIB(SDL_image, IMG_Load, have_SDL_image=yes, have_SDL_image=no)
  if test x$have_SDL_image = xno; then
!     AC_MSG_RESULT([disable SDL_image support])
  else
- 
      sdlimage=yes
      AC_ARG_ENABLE(sdlimage,
--- 519,529 ----
  
  have_SDL_image=no
! AC_CHECK_LIB(SDL_image, IMG_Load, have_SDL_image=yes, have_SDL_image=no,-lSDL)
  if test x$have_SDL_image = xno; then
!     AC_MSG_ERROR([You need the SDL_image library to compile this software.
!     Get it at http://www.devolution.com/~slouken/SDL/])
!     dnl    AC_MSG_RESULT([disable SDL_image support, SDL_image can be 
obtained at
!     dnl    Get it at http://www.devolution.com/~slouken/SDL/])
  else
      sdlimage=yes
      AC_ARG_ENABLE(sdlimage,
***************
*** 542,545 ****
--- 552,565 ----
  fi
  
+ dnl-------------------------------------------------------
+ dnl Checks for SDL_image
+ dnl-------------------------------------------------------
+ dnl AC_CHECK_LIB(SDL_ttf, TTF_OpenFont,,
+ dnl   AC_MSG_ERROR([You need the SDL_ttf library to compile this software.
+ dnl   Get it at http://www.libsdl.org/]),
+ dnl   -lSDL
+ dnl )
+ dnl LIBS="$LIBS -lSDL_ttf"
+ 
  AC_SUBST(IMAGE_LIBS)
  AC_SUBST(IMAGE_INCLUDE)
***************
*** 569,582 ****
  dnl AC_CHECK_FUNCS(strsep)
  
! SIGC_CFLAGS=`pkg-config sigc++-1.2 --cflags`
! dnl SIGC_CFLAGS="-I$prefix/include/sigc++-1.2 
-I$prefix/lib/sigc++-1.2/include"
! AC_SUBST(SIGC_CFLAGS)
! 
! SIGC_LIBS=`pkg-config sigc++-1.2 --libs`
! dnl SIGC_LIBS="-lsigc-1.1"
! AC_SUBST(SIGC_LIBS)
  
! PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS 
$RTTI_FLAGS $EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui2 $SIGC_LIBS $SDL_LIBS $LIBPHYSFS $IMAGE_LIBS 
$LIBEXPAT $FREETYPE_LIBS $EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"
--- 589,602 ----
  dnl AC_CHECK_FUNCS(strsep)
  
! dnl SIGC_CFLAGS=`pkg-config sigc++-1.2 --cflags`
! dnl dnl SIGC_CFLAGS="-I$prefix/include/sigc++-1.2 
-I$prefix/lib/sigc++-1.2/include"
! dnl AC_SUBST(SIGC_CFLAGS)
! 
! dnl SIGC_LIBS=`pkg-config sigc++-1.2 --libs`
! dnl dnl SIGC_LIBS="-lsigc-1.1"
! dnl AC_SUBST(SIGC_LIBS)
  
! PARAGUI_CFLAGS="$STL_CFLAGS $SIGC_CFLAGS $SIGCX_CFLAGS $FREETYPE_CFLAGS 
$SDL_CFLAGS $RTTI_FLAGS $EXTRA_FLAGS"
! PARAGUI_LIBS="-lparagui2 $SIGC_LIBS $SIGCX_LIBS $SDL_LIBS $LIBPHYSFS 
$IMAGE_LIBS $LIBEXPAT $FREETYPE_LIBS $EXTRA_LIBS $LIBSTDCPP"
  
  CXXFLAGS="$STLPORT_FLAGS $CFLAGS $IMAGE_INCLUDE $RTTI_FLAGS $EXCEPTIONS_FLAGS 
-I$prefix/include"