[Adonthell-commits] CVS: adonthell/src/gfx surface.h,1.1.2.1,1.1.2.2 surface.cc,1.1.2.1,1.1.2.2 screen.h,1.1.2.1,1.1.2.2 screen.cc,1.1.2.1,1.1.2.2 pnm.cc,1.1.2.1,1.1.2.2 image.h,1.1.2.1,1.1.2.2 image.cc,1.1.2.1,1.1.2.2 drawable.h,1.1.2.1,1.1.2.2 animation.h,1.1.2.1,1.1.2.2

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/gfx
In directory subversions:/tmp/cvs-serv9595/src/gfx

Modified Files:
      Tag: Branch_road_to_0-4
        surface.h surface.cc screen.h screen.cc pnm.cc image.h 
        image.cc drawable.h animation.h 
Log Message:
Now compiles well with GCC 2.95 as well.


Index: surface.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/surface.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** surface.h   30 Jun 2002 19:01:00 -0000      1.1.2.1
--- surface.h   1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 28,32 ****
  
  
! #include "drawable.h"
  
  namespace gfx
--- 28,32 ----
  
  
! #include "gfx/drawable.h"
  
  namespace gfx

Index: surface.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/surface.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** surface.cc  30 Jun 2002 19:01:00 -0000      1.1.2.1
--- surface.cc  1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 19,26 ****
   */ 
  
  #include "surface.h"
  #include "screen.h"
- 
- #include <iostream>
  
  using namespace gfx;
--- 19,26 ----
   */ 
  
+ #include <iostream>
+ 
  #include "surface.h"
  #include "screen.h"
  
  using namespace gfx;

Index: screen.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/screen.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** screen.h    30 Jun 2002 19:01:00 -0000      1.1.2.1
--- screen.h    1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 25,31 ****
  #define SCREEN_H_
  
- #include "surface.h"
  #include <string>
  
  
  namespace gfx
--- 25,31 ----
  #define SCREEN_H_
  
  #include <string>
  
+ #include "gfx/surface.h"
  
  namespace gfx

Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/screen.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** screen.cc   30 Jun 2002 19:01:00 -0000      1.1.2.1
--- screen.cc   1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 22,28 ****
   */
  
- #include "screen.h"
  #include <iostream>
  #include <sstream> 
  
  using namespace gfx;
--- 22,29 ----
   */
  
  #include <iostream>
  #include <sstream> 
+ 
+ #include "screen.h"
  
  using namespace gfx;

Index: pnm.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/pnm.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pnm.cc      30 Jun 2002 19:01:00 -0000      1.1.2.1
--- pnm.cc      1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 23,30 ****
   */
  
- 
- #include "pnm.h"
  #include <stdlib.h>
  #include <string.h>
  
  using namespace gfx;
--- 23,30 ----
   */
  
  #include <stdlib.h>
  #include <string.h>
+ 
+ #include "pnm.h"
  
  using namespace gfx;

Index: image.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/image.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** image.h     30 Jun 2002 19:01:00 -0000      1.1.2.1
--- image.h     1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 28,33 ****
  
  #include "fileops.h"
- #include "screen.h"
  
  
  namespace gfx
--- 28,33 ----
  
  #include "fileops.h"
  
+ #include "gfx/screen.h"
  
  namespace gfx

Index: image.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/image.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** image.cc    30 Jun 2002 19:01:00 -0000      1.1.2.1
--- image.cc    1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 24,27 ****
--- 24,28 ----
   
  #include <SDL/SDL_endian.h>
+ 
  #include "image.h"
  #include "pnm.h"

Index: drawable.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/drawable.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** drawable.h  30 Jun 2002 19:01:00 -0000      1.1.2.1
--- drawable.h  1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 26,30 ****
  #define DRAWABLE_H_
  
! #include "drawing_area.h"
  
  namespace gfx
--- 26,30 ----
  #define DRAWABLE_H_
  
! #include "gfx/drawing_area.h"
  
  namespace gfx

Index: animation.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gfx/Attic/animation.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** animation.h 30 Jun 2002 19:01:00 -0000      1.1.2.1
--- animation.h 1 Jul 2002 19:46:49 -0000       1.1.2.2
***************
*** 28,32 ****
  
  
! #include "image.h"
  #include <vector>
  
--- 28,32 ----
  
  
! #include "gfx/image.h"
  #include <vector>