[Pingus-CVS] CVS: Games/Pingus/src/gui Makefile.am, 1.6, 1.7 display.cxx, 1.3, 1.4 display.hxx, 1.3, 1.4 display_graphic_context.cxx, 1.6, 1.7 screen.hxx, 1.2, 1.3 screen_manager.hxx, 1.5, 1.6

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/gui
In directory dark:/tmp/cvs-serv20278/src/gui

Modified Files:
        Makefile.am display.cxx display.hxx 
        display_graphic_context.cxx screen.hxx screen_manager.hxx 
Log Message:
- fixed a few makefiles and configure.ac

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am 16 Aug 2003 20:51:28 -0000      1.6
+++ Makefile.am 18 Oct 2003 12:11:31 -0000      1.7
@@ -17,6 +17,7 @@
 
 noinst_LIBRARIES = libpingus_gui.a
 
+libpingus_gui_a_CPPFLAGS = @PINGUS_CFLAGS@
 libpingus_gui_a_SOURCES = \
         buffer_graphic_context.hxx \
         buffer_graphic_context.cxx \

Index: display.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display.cxx 19 Apr 2003 10:23:18 -0000      1.3
+++ display.cxx 18 Oct 2003 12:11:31 -0000      1.4
@@ -25,6 +25,8 @@
 #include "../globals.hxx"
 #include "display.hxx"
 
+namespace Pingus {
+
 std::list<DisplayHook*> Display::display_hooks;
 
 DisplayHook::DisplayHook() : is_visible(false)
@@ -80,4 +82,6 @@
   display_hooks.remove(hook);
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: display.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display.hxx 19 Apr 2003 10:23:18 -0000      1.3
+++ display.hxx 18 Oct 2003 12:11:31 -0000      1.4
@@ -23,6 +23,8 @@
 #include "../pingus.hxx"
 #include <list>
 
+namespace Pingus {
+
 class DisplayHook;
 
 /** A flip display hook can be used to attach an event to a
@@ -64,6 +66,8 @@
   Display& operator= (const Display&);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: display_graphic_context.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/display_graphic_context.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- display_graphic_context.cxx 16 Aug 2003 20:51:28 -0000      1.6
+++ display_graphic_context.cxx 18 Oct 2003 12:11:31 -0000      1.7
@@ -18,8 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/font.h>
 #include <config.h>
 #include "display_graphic_context.hxx"
 #include "../math.hxx"

Index: screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.hxx  19 Apr 2003 10:23:18 -0000      1.2
+++ screen.hxx  18 Oct 2003 12:11:31 -0000      1.3
@@ -24,6 +24,8 @@
 
 class GraphicContext;
 
+namespace Pingus {
+
 /** A interface for screens. A screen is a Pingus 'thing' which gets
     complete controll over the display and input. Examples of
     screens are the PingusMenu or a PingusGameSession */
@@ -57,6 +59,8 @@
   Screen& operator= (const Screen&);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: screen_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_manager.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screen_manager.hxx  16 Aug 2003 20:51:28 -0000      1.5
+++ screen_manager.hxx  18 Oct 2003 12:11:31 -0000      1.6
@@ -26,7 +26,9 @@
 #include "screen_ptr.hxx"
 
 class GraphicContext;
+namespace Pingus {
 class Screen;
+} // namespace Pingus
 
 class ScreenManager
 {