[paragui-cvs] CVS: paragui TODO,1.1.1.1.2.5,1.1.1.1.2.6 configure.in,1.8.2.4,1.8.2.5

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        TODO configure.in 
Log Message:
Add driver support
expand debugging code (but mostly disabled)
Some more clarification....  hope I got everything - T


Index: TODO
===================================================================
RCS file: /cvsroot/paragui/paragui/TODO,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** TODO        12 Sep 2002 06:38:49 -0000      1.1.1.1.2.5
--- TODO        7 Oct 2002 22:23:26 -0000       1.1.1.1.2.6
***************
*** 2,5 ****
--- 2,20 ----
  
  Teunis Peters - current TODO:
+       ! driver management:
+               add preinit/postremove code - done
+               module load/unload - hrm look to SDL?  (for drivers)
+                       - done, but requires --enable-dlopen in SDL compile
+               consider making SDL driver-specific rather than global?
+                       (still required but all access through driver)
+                       -> this could make windows/DirectX/.. drivers easier
+                       -- yes this includes event management
+               NULL driver
+               DirectX driver
+               OpenGL driver - needs more work
+               ! Font rendering needs to be moved into graphics driver !
+               (or at least the lowlevel portions)
+               pgfont.cpp -- accesses videobuffer directly...
+               pgapplication.cpp -- setIcon access videomemory (BAD!)
        ! SDL_image required?  the fallback (in src/core/pgfilearchive.cpp)
                crashes... but when SDL_image is installed it works.  Note that

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/configure.in,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** configure.in        12 Sep 2002 06:38:49 -0000      1.8.2.4
--- configure.in        7 Oct 2002 22:23:26 -0000       1.8.2.5
***************
*** 2,6 ****
  
  AC_INIT(README)
! AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
  
  TOP_BUILDDIR=`pwd`
--- 2,7 ----
  
  AC_INIT(README)
! AM_CONFIG_HEADER(include/paraconfig_gnu.h)
! dnl AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
  
  TOP_BUILDDIR=`pwd`
***************
*** 493,518 ****
  AC_SUBST(MATHLIB)
  
  dnl Check for OpenGL
  dnl this has problems - FIXME it shouldn't require "SDL/SDL_opengl.h"
  dnl anyone?
! AC_MSG_CHECKING(for OpenGL support)
! have_opengl=no
! saved_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS $SDL_CFLAGS"
! AC_TRY_COMPILE([
!  #include "SDL/SDL_opengl.h"
! ],[
! ],[
! have_opengl=yes
! ])
! CFLAGS="$saved_CFLAGS"
! AC_MSG_RESULT($have_opengl)
! if test x$have_opengl = xyes; then
!     CFLAGS="$CFLAGS -DHAVE_OPENGL"
!     GL_LIBS="$SYS_GL_LIBS"
! else
!     GL_LIBS=""
! fi
! AC_SUBST(GL_LIBS)
  
  dnl Check for SDL_image
--- 494,766 ----
  AC_SUBST(MATHLIB)
  
+ dnl rcg04172001 Set up the Null video driver.
+ CheckDummyVideo()
+ {
+     AC_ARG_ENABLE(video-dummy,
+ [  --enable-video-dummy    use dummy video driver [default=yes]],
+                   , enable_video_dummy=yes)
+     if test x$enable_video_dummy = xyes; then
+       AC_DEFINE([HAVE_DUMMYVIDEO], 1, [Define if we have dummy video driver])
+       # CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
+       VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy"
+       VIDEO_DRIVERS="$VIDEO_DRIVERS dummy/libpg_null.la"
+     fi
+ }
+ 
  dnl Check for OpenGL
+ dnl Check to see if OpenGL support is desired
+ AC_ARG_ENABLE(video-opengl,
+ [  --enable-video-opengl   include OpenGL video driver [default=yes]],
+               , enable_video_opengl=yes)
+ 
  dnl this has problems - FIXME it shouldn't require "SDL/SDL_opengl.h"
  dnl anyone?
! CheckOpenGL()
! {
!   if test x$enable_video_opengl = xyes; then
!       AC_MSG_CHECKING(for OpenGL support)
!       have_opengl=no
!       saved_CFLAGS="$CFLAGS"
!       CFLAGS="$CFLAGS $SDL_CFLAGS"
!       AC_TRY_COMPILE([
!        #include "SDL/SDL_opengl.h"
!       ],[
!       ],[
!       have_opengl=yes
!       ])
!       CFLAGS="$saved_CFLAGS"
!       AC_MSG_RESULT($have_opengl)
!       if test x$have_opengl = xyes; then
!           AC_DEFINE([HAVE_OPENGL], 1, [Define if we have OpenGL])
!           dnl CFLAGS="$CFLAGS -DHAVE_OPENGL"
!           GL_LIBS="$SYS_GL_LIBS"
!           VIDEO_SUBDIRS="$VIDEO_SUBDIRS opengl"
!           VIDEO_DRIVERS="$VIDEO_DRIVERS opengl/libpgopengl.la"
!       else
!           GL_LIBS=""
!       fi
!   fi
! }
! 
! dnl various tests from SDL's autoconf.  Thank you VERY much!
! 
! dnl Determine whether the compiler can produce Win32 executables
! CheckWIN32()
! {
!     AC_MSG_CHECKING(Win32 compiler)
!     have_win32_gcc=no
!     AC_TRY_COMPILE([
!      #include <windows.h>
!     ],[
!     ],[
!     have_win32_gcc=yes
!     ])
!     AC_MSG_RESULT($have_win32_gcc)
!     if test x$have_win32_gcc != xyes; then
!        AC_MSG_ERROR([
! *** Your compiler ($CC) does not produce Win32 executables!
!        ])
!     fi
!     AC_DEFINE([HAVE_WIN32], 1, [Define if we have Windows/32])
! 
!     dnl See if the user wants to redirect standard output to files
!     AC_ARG_ENABLE(stdio-redirect,
! [  --enable-stdio-redirect Redirect STDIO to files on Win32 [default=yes]],
!                   , enable_stdio_redirect=yes)
!     if test x$enable_stdio_redirect != xyes; then
!         CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
!     fi
! }
! 
! dnl Find the DirectX includes and libraries
! CheckDIRECTX()
! {
!     AC_ARG_ENABLE(directx,
! [  --enable-directx        use DirectX for Win32 audio/video [default=yes]],
!                   , enable_directx=yes)
!     if test x$enable_directx = xyes; then
!         AC_MSG_CHECKING(for DirectX headers and libraries)
!         use_directx=no
!         AC_TRY_COMPILE([
!          #include "src/video/windx5/directx.h"
!         ],[
!         ],[
!         use_directx=yes
!         ])
!         AC_MSG_RESULT($use_directx)
!     fi
! 
!     CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/wincommon"
!     SYSTEM_LIBS="$SYSTEM_LIBS -luser32 -lgdi32 -lwinmm"
!     # VIDEO_SUBDIRS="$VIDEO_SUBDIRS wincommon"
!     # VIDEO_DRIVERS="$VIDEO_DRIVERS wincommon/libvideo_wincommon.la"
!     # Enable the DIB driver
!     # CFLAGS="$CFLAGS -DENABLE_WINDIB"
!     # VIDEO_SUBDIRS="$VIDEO_SUBDIRS windib"
!     # VIDEO_DRIVERS="$VIDEO_DRIVERS windib/libvideo_windib.la"
!     # See if we should enable the DirectX driver
!     if test x$use_directx = xyes; then
!         CFLAGS="$CFLAGS -DENABLE_DIRECTX"
!         SYSTEM_LIBS="$SYSTEM_LIBS -ldxguid"
!         VIDEO_SUBDIRS="$VIDEO_SUBDIRS windx"
!         VIDEO_DRIVERS="$VIDEO_DRIVERS windx/libpgdx.la"
!       AC_DEFINE([HAVE_DIRECTX], 1, [Define if we have DirectX])
!     fi
! }
! 
! dnl figure out arch/DLOPEN/OpenGL
! dnl AC_MSG_CHECKING(System Architecture)
! case "$target" in
!     *-*-linux*)
!         ARCH=linux
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-bsdi*)
!         ARCH=bsdi
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-freebsd*)
!         ARCH=freebsd
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-netbsd*)
!         ARCH=netbsd
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-openbsd*)
!         ARCH=openbsd
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         # OpenBSD does not define "unix"
!         CFLAGS="$CFLAGS -Dunix"
!         ;;
!     *-*-sysv5*)
!         ARCH=sysv5
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-solaris*)
!         ARCH=solaris
!         CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-irix*)
!         ARCH=irix
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-hpux*)
!         ARCH=hpux
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-aix*)
!         ARCH=aix
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-osf*)
!         ARCH=osf
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-qnx*)
!         ARCH=qnx
!         # CheckDLOPEN
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-cygwin* | *-*-mingw32*)
!         ARCH=win32
!         if test "$build" != "$target"; then # cross-compiling
!             # Default cross-compile location
!             ac_default_prefix=/usr/local/cross-tools/i386-mingw32msvc
!         else
!             # Look for the location of the tools and install there
!             if [ "$BUILD_PREFIX" != "" ]; then
!                 ac_default_prefix=$BUILD_PREFIX
!             fi
!         fi
!         CheckDummyVideo
!         CheckOpenGL
!         CheckWIN32
!         CheckDIRECTX
!         # The Win32 platform requires special setup
!         case "$target" in
!             *-*-cygwin*)
!                 CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix 
-mno-cygwin"
!                 LIBS="$LIBS -mno-cygwin"
!                 ;;
!             *-*-mingw32*)
!                 ;;
!         esac
!         ;;
!     *-*-beos*)
!         ARCH=beos
!         ac_default_prefix=/boot/develop/tools/gnupro
!         CheckDummyVideo
!         CheckOpenGL
!         # The BeOS platform requires special libraries
!         SYSTEM_LIBS="$SYSTEM_LIBS -lroot -lbe -lmedia -lgame -ldevice 
-ltextencoding"
!         ;;
!     *-*-macos*)
!         # This would be used if cross-compiling to MacOS 9.  No way to
!         # use it at present, but Apple is working on a X-to-9 compiler
!         # for which this case would be handy.
!         ARCH=macos
!         CheckDummyVideo
!         CheckOpenGL
!         ;;
!     *-*-darwin* )
!         # Strictly speaking, we want "Mac OS X", not "Darwin", which is
!         # just the OS X kernel sans upper layers like Carbon and Cocoa.
!         # But config.guess comes back with "darwin", so go with the flow.
!         ARCH=macosx
!         CheckDummyVideo
!         CheckOpenGL
!         # The Cocoa backend still needs Carbon, and the YUV code QuickTime
!         SYSTEM_LIBS="$SYSTEM_LIBS -framework Cocoa -framework Carbon 
-framework QuickTime"
!         ;;
! esac
! AC_SUBST(ARCH)
! dnl AC_MSG_RESULT($ARCH)
! dnl AC_DEFINE([PG_ARCH], ARCH, [System Architecture])
! 
! # Set the conditional variables for this target
! AM_CONDITIONAL(TARGET_LINUX, test $ARCH = linux)
! AM_CONDITIONAL(TARGET_QTOPIA, test "x$video_qtopia" = "xyes")
! AM_CONDITIONAL(TARGET_SOLARIS, test $ARCH = solaris)
! AM_CONDITIONAL(TARGET_IRIX, test $ARCH = irix)
! AM_CONDITIONAL(TARGET_BSDI, test $ARCH = bsdi)
! AM_CONDITIONAL(TARGET_FREEBSD, test $ARCH = freebsd)
! AM_CONDITIONAL(TARGET_NETBSD, test $ARCH = netbsd)
! AM_CONDITIONAL(TARGET_OPENBSD, test $ARCH = openbsd)
! AM_CONDITIONAL(TARGET_AIX, test $ARCH = aix)
! AM_CONDITIONAL(TARGET_WIN32, test $ARCH = win32)
! AM_CONDITIONAL(TARGET_BEOS, test $ARCH = beos)
! AM_CONDITIONAL(TARGET_MACOS, test $ARCH = macos)
! AM_CONDITIONAL(TARGET_MACOSX, test $ARCH = macosx)
! AM_CONDITIONAL(TARGET_QNX, test $ARCH = qnx)
! AM_CONDITIONAL(TARGET_MINT, test $ARCH = mint)
! 
! # More automake conditionals
! AM_CONDITIONAL(USE_DIRECTX, test x$use_directx = xyes)
! AM_CONDITIONAL(USE_CLONE, test x$use_clone = xyes)
  
  dnl Check for SDL_image
***************
*** 607,610 ****
--- 855,861 ----
  AC_SUBST(PARAGUI_CFLAGS)
  AC_SUBST(PARAGUI_LIBS)
+ AC_SUBST(VIDEO_SUBDIRS)
+ AC_SUBST(VIDEO_DRIVERS)
+ AC_SUBST(GL_LIBS)
  
  # lookup the root directory for building RPM's
***************
*** 628,631 ****
--- 879,885 ----
  src/expat/Makefile
  src/draw/Makefile
+ src/draw/dummy/Makefile
+ src/draw/opengl/Makefile
+ src/draw/windx/Makefile
  src/font/Makefile
  src/themes/Makefile