[Adonthell-commits] CVS: adonthell/src Makefile.am,1.92,1.93 screen.cc,1.16,1.17

[Alexandre Courbot <address@hidden>]

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

Modified Files:
        Makefile.am screen.cc 
Log Message:
Now 100% gcc 3.1 compliant
Can compile outside of the source directory


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** Makefile.am 28 Jun 2002 12:15:20 -0000      1.92
--- Makefile.am 30 Jun 2002 19:11:08 -0000      1.93
***************
*** 49,54 ****
  py_adonthell_wrap.cc : py_adonthell.i
        @if test "${P_SWIG}"; then \
!          ${P_SWIG} -python -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(srcdir)/.. 
-c++ -make_default -o $*.cc $(srcdir)/py_adonthell.i; \
!            mv adonthell.py modules/adonthell.py; \
        else \
           echo "You need swig >= 1.3.10 in order to re-build this file."; \
--- 49,54 ----
  py_adonthell_wrap.cc : py_adonthell.i
        @if test "${P_SWIG}"; then \
!          ${P_SWIG} -python -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(srcdir)/.. 
-c++ -make_default -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \
!            mv $(srcdir)/adonthell.py modules/adonthell.py; \
        else \
           echo "You need swig >= 1.3.10 in order to re-build this file."; \

Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/screen.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** screen.cc   28 Jun 2002 12:15:21 -0000      1.16
--- screen.cc   30 Jun 2002 19:11:08 -0000      1.17
***************
*** 24,28 ****
  #include "screen.h"
  #include <iostream>
! #include <strstream> 
  
  
--- 24,28 ----
  #include "screen.h"
  #include <iostream>
! #include <sstream> 
  
  
***************
*** 111,115 ****
  {
      const SDL_VideoInfo * vi = SDL_GetVideoInfo ();
!     ostrstream temp; 
  
      const int driver_name_length = 500;
--- 111,115 ----
  {
      const SDL_VideoInfo * vi = SDL_GetVideoInfo ();
!     ostringstream temp; 
  
      const int driver_name_length = 500;
***************
*** 133,139 ****
           << ends;
  
!     char *s = temp.str ();
!     string ret (s);
!     delete[] s;
  
      return ret; 
--- 133,137 ----
           << ends;
  
!     string ret = temp.str ();
  
      return ret;