[paragui-cvs] CVS: paragui/src/draw/opengl Makefile.am,1.1.2.1,1.1.2.2 pgglcore.cpp,1.1.2.1,1.1.2.2 pgglroot.cpp,1.1.2.1,1.1.2.2 pgglsurf.cpp,1.1.2.3,1.1.2.4

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/draw/opengl
In directory subversions:/tmp/cvs-serv29364/src/draw/opengl

Modified Files:
      Tag: devel-opengl
        Makefile.am pgglcore.cpp pgglroot.cpp pgglsurf.cpp 
Log Message:
- GCC 3.2 compilation fixes
- updated physfs



Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Makefile.am 30 Oct 2002 17:36:28 -0000      1.1.2.1
--- Makefile.am 30 Oct 2002 20:15:17 -0000      1.1.2.2
***************
*** 16,20 ****
  INCLUDES = \
        $(SDL_CFLAGS) \
!       -I$(top_srcdir)/include
  
  style_cvs:
--- 16,21 ----
  INCLUDES = \
        $(SDL_CFLAGS) \
!       -I$(top_srcdir)/include \
!       -I$(srcdir)/..
  
  style_cvs:

Index: pgglcore.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pgglcore.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgglcore.cpp        30 Oct 2002 19:17:31 -0000      1.1.2.1
--- pgglcore.cpp        30 Oct 2002 20:15:17 -0000      1.1.2.2
***************
*** 368,372 ****
  
  PG_DrawableSurface* PG_GLDraw::AccelDrawableSurface(SDL_Surface* src,
!                                                   bool hasalpha=false) {
    PG_GLDrawableSurface* surf;
    SDL_Surface *s, *tmp;
--- 368,372 ----
  
  PG_DrawableSurface* PG_GLDraw::AccelDrawableSurface(SDL_Surface* src,
!                                                   bool hasalpha) {
    PG_GLDrawableSurface* surf;
    SDL_Surface *s, *tmp;
***************
*** 458,463 ****
  
  PG_DrawableSurface* PG_GLDraw::CreateDrawableSurface(Uint32 flags,
!                                                    int width, int height, int 
depth=0,
!                                                    Uint32 Rmask=0, Uint32 
Gmask=0, Uint32 Bmask=0, Uint32 Amask=0) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
    if (depth == 0) depth = _RGBfmt.BitsPerPixel;
--- 458,463 ----
  
  PG_DrawableSurface* PG_GLDraw::CreateDrawableSurface(Uint32 flags,
!                                                    int width, int height, int 
depth,
!                                                    Uint32 Rmask, Uint32 
Gmask, Uint32 Bmask, Uint32 Amask) {
    // depth = Rmask = Gmask = Bmask = Amask = 0;
    if (depth == 0) depth = _RGBfmt.BitsPerPixel;

Index: pgglroot.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pgglroot.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgglroot.cpp        30 Oct 2002 09:16:29 -0000      1.1.2.1
--- pgglroot.cpp        30 Oct 2002 20:15:17 -0000      1.1.2.2
***************
*** 235,239 ****
  };
  
! void PG_GLRootDrawableSurface::DrawLine(Uint32 x0, Uint32 y0, Uint32 x1, 
Uint32 y1, const SDL_Color& color, Uint8 width = 1) {
    DBG5(DBGLINE());
    return; // DEBUG
--- 235,239 ----
  };
  
! void PG_GLRootDrawableSurface::DrawLine(Uint32 x0, Uint32 y0, Uint32 x1, 
Uint32 y1, const SDL_Color& color, Uint8 width) {
    DBG5(DBGLINE());
    return; // DEBUG

Index: pgglsurf.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pgglsurf.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** pgglsurf.cpp        30 Oct 2002 09:16:29 -0000      1.1.2.3
--- pgglsurf.cpp        30 Oct 2002 20:15:17 -0000      1.1.2.4
***************
*** 264,268 ****
  };
  
! void PG_GLDrawableSurface::DrawLine(Uint32 x0, Uint32 y0, Uint32 x1, Uint32 
y1, const SDL_Color& color, Uint8 width = 1) {
    DBG5(DBGLINE());
    PG_DrawableSurface::DrawLine(x0,y0,x1,y1,color,width);
--- 264,268 ----
  };
  
! void PG_GLDrawableSurface::DrawLine(Uint32 x0, Uint32 y0, Uint32 x1, Uint32 
y1, const SDL_Color& color, Uint8 width) {
    DBG5(DBGLINE());
    PG_DrawableSurface::DrawLine(x0,y0,x1,y1,color,width);