[Pingus-CVS] r2529 - in trunk: . src src/components src/editor src/sound src/tinygettext

[grumbel at BerliOS]

Author: grumbel
Date: 2005-12-02 02:33:04 +0100 (Fri, 02 Dec 2005)
New Revision: 2529

Added:
   trunk/src/components/Makefile.am
   trunk/src/tinygettext/Makefile.am
Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/SConscript
   trunk/src/editor/Makefile.am
   trunk/src/file_reader.hxx
   trunk/src/pingu_action_factory.cxx
   trunk/src/pingu_action_factory.hxx
   trunk/src/sound/Makefile.am
Log:
- fixed makefiles a bit, not sure if it works, havn't tested

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/configure.ac  2005-12-02 01:33:04 UTC (rev 2529)
@@ -120,6 +120,7 @@
           src/caimagemanipulation/Makefile
            src/colliders/Makefile
            src/gui/Makefile
+           src/editor/Makefile
            src/input/Makefile
           src/input/axes/Makefile
           src/input/buttons/Makefile
@@ -128,6 +129,8 @@
            src/movers/Makefile
            src/particles/Makefile
            src/sound/Makefile
+           src/components/Makefile
+           src/tinygettext/Makefile
            src/worldobjs/Makefile
           src/worldmap/Makefile
            data/Makefile 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am       2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/Makefile.am       2005-12-02 01:33:04 UTC (rev 2529)
@@ -28,7 +28,7 @@
        actions             \
        caimagemanipulation \
        colliders           \
-       editor                          \
+       editor              \
         gui                 \
         input               \
        movers              \
@@ -68,6 +68,8 @@
        input/pointers/libpingus_input_pointers.a \
        input/scrollers/libpingus_input_scrollers.a \
        editor/libpingus_editor.a \
+       components/libpingus_components.a \
+       tinygettext/libpingus_tinygettext.a \
         @PINGUS_LIBS@ \
         @ICONV_LIBS@ \
         @LIBS@
@@ -85,26 +87,24 @@
 resource_modifier.cxx
 
 pingus_SOURCES = \
-action_button.cxx \
-action_button.hxx \
 action_data.hxx \
 action_holder.cxx \
 action_holder.hxx \
 blitter.cxx \
 blitter.hxx \
-blitter_test.hxx \
-blitter_test.cxx \
 blitter_impl.hxx \
-button_panel.cxx \
-button_panel.hxx \
+blitter_test.cxx \
+blitter_test.hxx \
 capture_rectangle.cxx \
 capture_rectangle.hxx \
-cheat.hxx \
 cheat.cxx \
+cheat.hxx \
 client.cxx \
 client.hxx \
 col_map.cxx \
 col_map.hxx \
+collider.cxx \
+collider.hxx \
 config.cxx \
 config.hxx \
 console.cxx \
@@ -120,8 +120,8 @@
 demo_player.hxx \
 demo_recorder.cxx \
 demo_recorder.hxx \
-demo_session.hxx \
 demo_session.cxx \
+demo_session.hxx \
 direction.cxx \
 direction.hxx \
 exit_menu.cxx \
@@ -130,12 +130,12 @@
 file_dialog.hxx \
 file_dialog_item.cxx \
 file_dialog_item.hxx \
-file_reader_impl.hxx \
-file_reader.hxx \
 file_reader.cxx \
+file_reader.hxx \
+file_reader_impl.hxx \
 file_writer.hxx \
-fonts.hxx \
 fonts.cxx \
+fonts.hxx \
 fps_counter.cxx \
 fps_counter.hxx \
 game_counter.cxx \
@@ -147,32 +147,26 @@
 game_session_result.hxx \
 game_time.cxx \
 game_time.hxx \
+gettext.cxx \
+gettext.h \
 global_event.cxx \
 global_event.hxx \
 globals.cxx \
 globals.hxx \
-goal_manager.hxx \
 goal_manager.cxx \
-graphic_context_state.hxx \
+goal_manager.hxx \
 graphic_context_state.cxx \
-groundtype.hxx \
+graphic_context_state.hxx \
+ground_map.cxx \
+ground_map.hxx \
 groundtype.cxx \
-gui_obj.hxx \
-gui_obj.cxx \
-html_browser.cxx \
-html_browser.hxx \
-hurry_up.cxx \
-hurry_up.hxx \
+groundtype.hxx \
 input_event.hxx \
 layer_manager.cxx \
 layer_manager.hxx \
 loading.cxx \
 loading.hxx \
 math.hxx \
-menu_background.cxx \
-menu_background.hxx \
-menu_button.cxx \
-menu_button.hxx \
 mover.cxx \
 mover.hxx \
 multiline_text.cxx \
@@ -185,21 +179,15 @@
 pingu_action.hxx \
 pingu_action_factory.cxx \
 pingu_action_factory.hxx \
-collider.cxx \
-collider.hxx \
 pingu_enums.cxx \
 pingu_enums.hxx \
 pingu_holder.cxx \
 pingu_holder.hxx \
-pingu_map.cxx \
-pingu_map.hxx \
 pingus.hxx \
-pingus_counter.cxx \
-pingus_counter.hxx \
-pingus_counter_bar.cxx \
-pingus_counter_bar.hxx \
 pingus_error.cxx \
 pingus_error.hxx \
+pingus_level.cxx \
+pingus_level.hxx \
 pingus_main.cxx \
 pingus_main.hxx \
 pingus_map_manager.cxx \
@@ -208,70 +196,56 @@
 pingus_menu.hxx \
 pingus_menu_manager.cxx \
 pingus_menu_manager.hxx \
-resource.cxx \
-resource.hxx \
 pingus_sub_menu.cxx \
 pingus_sub_menu.hxx \
-playfield.cxx \
-playfield.hxx \
-pingus_level.hxx \
-pingus_level.cxx \
-xml_pingus_level.hxx \
-xml_pingus_level.cxx \
-plf_res_mgr.hxx \
 plf_res_mgr.cxx \
+plf_res_mgr.hxx \
 plt_xml.cxx \
 plt_xml.hxx \
-preview_renderer.hxx \
 preview_renderer.cxx \
+preview_renderer.hxx \
 range.cxx \
 range.hxx \
 res_descriptor.cxx \
 res_descriptor.hxx \
+resource.cxx \
+resource.hxx \
 resource_modifier.cxx \
 resource_modifier.hxx \
 result_screen.cxx \
 result_screen.hxx \
-savegame.hxx \
 savegame.cxx \
-savegame_manager.hxx \
+savegame.hxx \
 savegame_manager.cxx \
+savegame_manager.hxx \
 screenshot.cxx \
 screenshot.hxx \
 server.cxx \
 server.hxx \
-server_event.hxx \
 server_event.cxx \
-smallmap.cxx \
-smallmap.hxx \
+server_event.hxx \
 smallmap_image.cxx \
 smallmap_image.hxx \
-spot_map.cxx \
-spot_map.hxx \
-state_sprite.hxx \
-state_sprite.cxx \
-start_screen.hxx \
 start_screen.cxx \
-stat_manager.hxx \
+start_screen.hxx \
 stat_manager.cxx \
-story.hxx \
+stat_manager.hxx \
+state_sprite.cxx \
+state_sprite.hxx \
 story.cxx \
-story_screen.hxx \
+story.hxx \
 story_screen.cxx \
+story_screen.hxx \
 string_format.cxx \
 string_format.hxx \
 system.cxx \
 system.hxx \
 theme.cxx \
 theme.hxx \
-time_display.cxx \
-time_display.hxx \
 timer.cxx \
 timer.hxx \
-gettext.h \
-gettext.cxx \
-tinygettext.cxx \
-tinygettext.hxx \
+tinygettext/tinygettext.cxx \
+tinygettext/tinygettext.hxx \
 true_server.cxx \
 true_server.hxx \
 vector.cxx \
@@ -282,12 +256,14 @@
 worldobj.hxx \
 worldobj_factory.cxx \
 worldobj_factory.hxx \
-xml_file_reader.hxx \
 xml_file_reader.cxx \
-xml_file_writer.hxx \
+xml_file_reader.hxx \
 xml_file_writer.cxx \
-xml_pdf.hxx \
+xml_file_writer.hxx \
 xml_pdf.cxx \
+xml_pdf.hxx \
+xml_pingus_level.cxx \
+xml_pingus_level.hxx \
 display/drawing_context.cxx \
 display/drawing_context.hxx \
 display/scene_context.cxx \

Modified: trunk/src/SConscript
===================================================================
--- trunk/src/SConscript        2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/SConscript        2005-12-02 01:33:04 UTC (rev 2529)
@@ -76,7 +76,8 @@
 'actions/teleported.cxx', 
 'actions/waiter.cxx', 
 'actions/walker.cxx', 
-'blitter.cxx', 
+'blitter.cxx',
+'blitter_test.cxx', 
 'capture_rectangle.cxx', 
 'cheat.cxx', 
 'client.cxx', 

Added: trunk/src/components/Makefile.am
===================================================================
--- trunk/src/components/Makefile.am    2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/components/Makefile.am    2005-12-02 01:33:04 UTC (rev 2529)
@@ -0,0 +1,46 @@
+# Pingus - A free Lemmings clone
+# Copyright (C) 1999 Ingo Ruhnke <address@hidden>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# -- Static Libs --
+noinst_LIBRARIES = libpingus_components.a
+
+libpingus_components_a_CPPFLAGS = @PINGUS_CFLAGS@
+libpingus_components_a_SOURCES = \
+hurry_up.cxx \
+hurry_up.hxx \
+menu_button.cxx \
+menu_button.hxx \
+action_button.cxx \
+action_button.hxx \
+button_panel.cxx \
+button_panel.hxx \
+hurry_up.cxx \
+hurry_up.hxx \
+menu_button.cxx \
+menu_button.hxx \
+pingus_counter.cxx \
+pingus_counter.hxx \
+pingus_counter_bar.cxx \
+pingus_counter_bar.hxx \
+playfield.cxx \
+playfield.hxx \
+smallmap.cxx \
+smallmap.hxx \
+time_display.cxx \
+time_display.hxx
+
+# EOF #

Modified: trunk/src/editor/Makefile.am
===================================================================
--- trunk/src/editor/Makefile.am        2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/editor/Makefile.am        2005-12-02 01:33:04 UTC (rev 2529)
@@ -1,4 +1,4 @@
-# Pingus - A free Lemmings clone
+# Pingus - A free Lemmings clone
 # Copyright (C) 1999 Ingo Ruhnke <address@hidden>
 #
 # This program is free software; you can redistribute it and/or
@@ -28,6 +28,6 @@
 editor_viewport.cxx    editor_viewport.hxx \
 xml_level.cxx          xml_level.hxx           \
 level_objs.cxx         level_objs.hxx          \
-level_impl.hxx \
+level_impl.hxx
 
 # EOF #

Modified: trunk/src/file_reader.hxx
===================================================================
--- trunk/src/file_reader.hxx   2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/file_reader.hxx   2005-12-02 01:33:04 UTC (rev 2529)
@@ -42,6 +42,8 @@
   FileReader(CL_SharedPtr<FileReaderImpl> impl_);
   FileReader();
 
+  /** Name of the current section, ie. in the case of
+      <groundpiece><pos>...</groundpiece> it would be 'groundpiece' */
   std::string get_name() const;
 
   bool read_int   (const char* name, int&)           const;

Modified: trunk/src/pingu_action_factory.cxx
===================================================================
--- trunk/src/pingu_action_factory.cxx  2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/pingu_action_factory.cxx  2005-12-02 01:33:04 UTC (rev 2529)
@@ -52,6 +52,39 @@
 
 PinguActionFactory* PinguActionFactory::instance_ = 0;
 
+class PinguActionAbstractFactory
+{
+public:
+  PinguActionAbstractFactory (Actions::ActionName id) {
+    PinguActionFactory::instance ()-> register_factory (id, this);
+  }
+  virtual ~PinguActionAbstractFactory() {}
+
+  virtual PinguAction* create (Pingu* p) =0;
+
+private:
+  PinguActionAbstractFactory (const PinguActionAbstractFactory&);
+  PinguActionAbstractFactory& operator= (const PinguActionAbstractFactory&);
+};
+
+template<class T>
+class PinguActionFactoryImpl : public PinguActionAbstractFactory
+{
+public:
+  PinguActionFactoryImpl (Actions::ActionName id)
+    : PinguActionAbstractFactory (id)
+  {
+  }
+
+  PinguAction* create (Pingu* p) {
+    return new T (p);
+  }
+
+private:
+  PinguActionFactoryImpl (const PinguActionFactoryImpl&);
+  PinguActionFactoryImpl& operator= (const PinguActionFactoryImpl&);
+};
+
 PinguActionFactory::PinguActionFactory ()
 {
 }

Modified: trunk/src/pingu_action_factory.hxx
===================================================================
--- trunk/src/pingu_action_factory.hxx  2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/pingu_action_factory.hxx  2005-12-02 01:33:04 UTC (rev 2529)
@@ -63,39 +63,6 @@
   PinguActionFactory& operator= (const PinguActionFactory&);
 };
 
-class PinguActionAbstractFactory
-{
-public:
-  PinguActionAbstractFactory (Actions::ActionName id) {
-    PinguActionFactory::instance ()-> register_factory (id, this);
-  }
-  virtual ~PinguActionAbstractFactory() {}
-
-  virtual PinguAction* create (Pingu* p) =0;
-
-private:
-  PinguActionAbstractFactory (const PinguActionAbstractFactory&);
-  PinguActionAbstractFactory& operator= (const PinguActionAbstractFactory&);
-};
-
-template<class T>
-class PinguActionFactoryImpl : public PinguActionAbstractFactory
-{
-public:
-  PinguActionFactoryImpl (Actions::ActionName id)
-    : PinguActionAbstractFactory (id)
-  {
-  }
-
-  PinguAction* create (Pingu* p) {
-    return new T (p);
-  }
-
-private:
-  PinguActionFactoryImpl (const PinguActionFactoryImpl&);
-  PinguActionFactoryImpl& operator= (const PinguActionFactoryImpl&);
-};
-
 } // namespace Pingus
 
 #endif

Modified: trunk/src/sound/Makefile.am
===================================================================
--- trunk/src/sound/Makefile.am 2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/sound/Makefile.am 2005-12-02 01:33:04 UTC (rev 2529)
@@ -1,4 +1,4 @@
-# Pingus - A free Lemmings clone
+# Pingus - A free Lemmings clone
 # Copyright (C) 1999 Ingo Ruhnke <address@hidden>
 #
 # This program is free software; you can redistribute it and/or

Added: trunk/src/tinygettext/Makefile.am
===================================================================
--- trunk/src/tinygettext/Makefile.am   2005-12-02 01:11:20 UTC (rev 2528)
+++ trunk/src/tinygettext/Makefile.am   2005-12-02 01:33:04 UTC (rev 2529)
@@ -0,0 +1,24 @@
+# Pingus - A free Lemmings clone
+# Copyright (C) 1999 Ingo Ruhnke <address@hidden>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# -- Static Libs --
+noinst_LIBRARIES = libpingus_tinygettext.a
+
+libpingus_tinygettext_a_CPPFLAGS = @PINGUS_CFLAGS@
+libpingus_tinygettext_a_SOURCES = tinygettext.cxx tinygettext.hxx
+
+# EOF #