[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2992 - in branches/pingus_sdl/src: . tinygettext worldmap
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r2992 - in branches/pingus_sdl/src: . tinygettext worldmap |
|
Date: |
Fri, 17 Aug 2007 18:49:16 +0200 |
Author: grumbel
Date: 2007-08-17 18:49:14 +0200 (Fri, 17 Aug 2007)
New Revision: 2992
Modified:
branches/pingus_sdl/src/SConscript
branches/pingus_sdl/src/tinygettext/language_def.cpp
branches/pingus_sdl/src/tinygettext/language_def.hpp
branches/pingus_sdl/src/worldmap/level_dot.cpp
Log:
- little Sconscript cleanup
- windstille > tinygettext header replacement
- removed debug std::cout
Modified: branches/pingus_sdl/src/SConscript
===================================================================
--- branches/pingus_sdl/src/SConscript 2007-08-17 16:43:15 UTC (rev 2991)
+++ branches/pingus_sdl/src/SConscript 2007-08-17 16:49:14 UTC (rev 2992)
@@ -22,39 +22,12 @@
env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
CC = 'gcc',
- CCFLAGS = ['-O0', '-Wall', '-Werror', '-g'])
-sdl_env = Environment(CC = 'gcc',
- CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'])
+ CCFLAGS = ['-O0', '-Wall', '-Werror', '-g'],
+ CPPPATH = ['..', '.'])
-# env.Copy(LIBS = ['a', 'b'])
-
-# FIXME: Make this configurable
-# env['ENV']['PKG_CONFIG_PATH'] =
'/home/ingo/run/ClanLib-0.8-2005-12-01/lib/pkgconfig/'
-#
env.ParseConfig('PKG_CONFIG_PATH=/home/ingo/run/ClanLib-0.8-2005-12-01/lib/pkgconfig/
pkg-config --cflags --libs \
-# clanCore-0.8 ">=" 0.8.0 \
-# clanApp-0.8 ">=" 0.8.0 \
-# clanDisplay-0.8 ">=" 0.8.0 \
-# clanGL-0.8 ">=" 0.8.0 \
-# clanSDL-0.8 ">=" 0.8.0 \
-# clanGUI-0.8 ">=" 0.8.0 \
-# clanGUIStyleSilver-0.8 ">=" 0.8.0 \
-# clanSound-0.8 ">=" 0.8.0 \
-# clanVorbis-0.8 ">=" 0.8.0 \
-# clanMikMod-0.8 ">=" 0.8.0')
-
env.ParseConfig('sdl-config --cflags --libs')
env['LIBS'] += ['SDL_image', 'SDL_mixer', 'physfs', 'png']
-# sdl_env.ParseConfig('sdl-config --cflags --libs')
-# sdl_env['LIBS'] += ['SDL_image']
-# sdl_env.Program('display/scene_test', [
-# 'display/scene_graph.cxx',
-# 'display/sprite_node.cxx',
-# 'display/scene_node.cxx',
-# 'math/rect.cpp',
-# 'math/origin.cpp',
-# 'display/scene_test.cxx'])
-
env.Program('../pingus', [
# # 'gui/buffer_graphic_context.cpp',
@@ -303,8 +276,6 @@
'worldobjs/teleporter_target.cpp',
'worldobjs/thunderstorm_background.cpp',
'worldobjs/woodthing.cpp',
+])
-],
-CPPPATH = env['CPPPATH'] + ['..'] + ['.'])
-
## EOF ##
Modified: branches/pingus_sdl/src/tinygettext/language_def.cpp
===================================================================
--- branches/pingus_sdl/src/tinygettext/language_def.cpp 2007-08-17
16:43:15 UTC (rev 2991)
+++ branches/pingus_sdl/src/tinygettext/language_def.cpp 2007-08-17
16:49:14 UTC (rev 2992)
@@ -1,27 +1,21 @@
-/* $Id$
-** __ __ __ ___ __ __ __ __
-** / \ / \__| ____ __| _/_______/ |_|__| | | | ____
-** \ \/\/ / |/ \ / __ |/ ___/\ __\ | | | | _/ __ \
-** \ /| | | \/ /_/ |\___ \ | | | | |_| |_\ ___/
-** \__/\ / |__|___| /\____ /____ > |__| |__|____/____/\___ >
-** \/ \/ \/ \/ \/
-** Copyright (C) 2007 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.
-*/
+// $Id$
+//
+// TinyGetText - A small flexible gettext() replacement
+// Copyright (C) 2004 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.
#include "language_def.hpp"
Modified: branches/pingus_sdl/src/tinygettext/language_def.hpp
===================================================================
--- branches/pingus_sdl/src/tinygettext/language_def.hpp 2007-08-17
16:43:15 UTC (rev 2991)
+++ branches/pingus_sdl/src/tinygettext/language_def.hpp 2007-08-17
16:49:14 UTC (rev 2992)
@@ -1,27 +1,21 @@
-/* $Id$
-** __ __ __ ___ __ __ __ __
-** / \ / \__| ____ __| _/_______/ |_|__| | | | ____
-** \ \/\/ / |/ \ / __ |/ ___/\ __\ | | | | _/ __ \
-** \ /| | | \/ /_/ |\___ \ | | | | |_| |_\ ___/
-** \__/\ / |__|___| /\____ /____ > |__| |__|____/____/\___ >
-** \/ \/ \/ \/ \/
-** Copyright (C) 2007 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.
-*/
+// $Id$
+//
+// TinyGetText - A small flexible gettext() replacement
+// Copyright (C) 2004 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.
#ifndef HEADER_LANGUAGE_DEF_HPP
#define HEADER_LANGUAGE_DEF_HPP
Modified: branches/pingus_sdl/src/worldmap/level_dot.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.cpp 2007-08-17 16:43:15 UTC
(rev 2991)
+++ branches/pingus_sdl/src/worldmap/level_dot.cpp 2007-08-17 16:49:14 UTC
(rev 2992)
@@ -102,7 +102,7 @@
void
LevelDot::on_click()
{
- std::cout << "Starting level: " << levelname << std::endl;
+ //std::cout << "Starting level: " << levelname << std::endl;
ScreenManager::instance()->push_screen(new StartScreen(plf),
true);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2992 - in branches/pingus_sdl/src: . tinygettext worldmap,
grumbel at BerliOS <=