[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-10-11 21:43 GMT

[pingus]

2 new revisions:

Revision: 3cfb094cc38a
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct 11 14:40:41 2011
Log:      Removed duplicate log_pretty_print() function
http://code.google.com/p/pingus/source/detail?r=3cfb094cc38a

Revision: daf34b3675de
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct 11 14:42:55 2011
Log:      Code fixes to make it compile with mingw32 cross compiler
http://code.google.com/p/pingus/source/detail?r=daf34b3675de

==============================================================================
Revision: 3cfb094cc38a
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct 11 14:40:41 2011
Log:      Removed duplicate log_pretty_print() function

http://code.google.com/p/pingus/source/detail?r=3cfb094cc38a

Deleted:
 /src/util/raise_exception.cpp
Modified:
 /src/util/raise_exception.hpp

=======================================
--- /src/util/raise_exception.cpp       Tue Feb  1 10:02:31 2011
+++ /dev/null
@@ -1,38 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 1998-2011 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 3 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, see <http://www.gnu.org/licenses/>.
-
-#include "util/raise_exception.hpp"
-
-std::string log_pretty_print(const std::string& str)
-{
-  // FIXME: very basic, might not work with complex return types
-  std::string::size_type function_start = 0;
-  for(std::string::size_type i = 0; i < str.size(); ++i)
-  {
-    if (str[i] == ' ')
-    {
-      function_start = i+1;
-    }
-    else if (str[i] == '(')
-    {
-      return str.substr(function_start, i - function_start) + "()";
-    }
-  }
-
-  return str.substr(function_start);
-}
-
-/* EOF */
=======================================
--- /src/util/raise_exception.hpp       Sun Sep 11 15:15:43 2011
+++ /src/util/raise_exception.hpp       Tue Oct 11 14:40:41 2011
@@ -21,7 +21,7 @@
 #include <string>
 #include <stdexcept>

-std::string log_pretty_print(const std::string& str);
+#include "util/log.hpp"

 #define raise_exception(type, expr) do {  \
   std::ostringstream b42465a70169; \

==============================================================================
Revision: daf34b3675de
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct 11 14:42:55 2011
Log:      Code fixes to make it compile with mingw32 cross compiler

http://code.google.com/p/pingus/source/detail?r=daf34b3675de

Added:
 /SConscript.win32
 /SConstruct.win32
Modified:
 /.gitignore
 /src/engine/input/event.hpp
 /src/main.cpp
 /src/pingus/server.cpp
 /src/util/system.cpp

=======================================
--- /dev/null
+++ /SConscript.win32   Tue Oct 11 14:42:55 2011
@@ -0,0 +1,54 @@
+env = Environment(PATH="/home/ingo/projects/mingw32/run/bin:$PATH",
+                   
PKG_CONFIG_LIBDIR="/home/ingo/projects/mingw32/run/lib/pkgconfig:/home/ingo/projects/mingw32/run/opt/gtk/lib/pkgconfig",
+                  CXXFLAGS=["-O3", "-s", "-std=c++0x"],
+                  CPPDEFINES=['HAVE_SDL'],
+                  PROGSUFFIX = '.exe',
+                  CXX='i586-mingw32msvc-c++',
+                  AR='i586-mingw32msvc-ar',
+                  RANLIB='i586-mingw32msvc-ranlib',
+                  CPPPATH=['src/mingw32/',
+                           'src/',
+                           '/home/ingo/projects/mingw32/run/include',
+                           
'/home/ingo/projects/mingw32/run/opt/SDL-1.2.14/include/SDL',
+                           
'/home/ingo/projects/mingw32/run/opt/SDL_image-1.2.10/include',
+                           
'/home/ingo/projects/mingw32/run/opt/SDL_mixer-1.2.11/include',
+                           
'/home/ingo/projects/mingw32/run/opt/openal1.1/include',
+                           '/home/ingo/projects/mingw32/run/opt/gtk/include'  
],
+                  LIBPATH = [ '/home/ingo/projects/mingw32/run/lib',
+                              
'/home/ingo/projects/mingw32/run/opt/SDL-1.2.14/lib',
+                              
'/home/ingo/projects/mingw32/run/opt/SDL_image-1.2.10/lib',
+                              
'/home/ingo/projects/mingw32/run/opt/SDL_mixer-1.2.11/lib',
+                              '/home/ingo/projects/mingw32/run/opt/gtk/lib'  
],
+                  LIBS =  
[ 'mingw32', 'SDLmain', "SDL", "SDL_mixer", "SDL_image", "boost_signals", "png"])
+
+pingus_sources = \
+               Glob('external/tinygettext/tinygettext/*.cpp') + \
+               Glob('src/*.cpp') + \
+               Glob('src/editor/*.cpp') + \
+               Glob('src/engine/display/*.cpp') + \
+               Glob('src/engine/display/delta/*.cpp') + \
+               Glob('src/engine/gui/*.cpp') + \
+               Glob('src/engine/input/*.cpp') + \
+               Glob('src/engine/resource/*.cpp') + \
+               Glob('src/engine/screen/*.cpp') + \
+               Glob('src/engine/sound/*.cpp') + \
+               Glob('src/engine/system/*.cpp') + \
+               Glob('src/lisp/*.cpp') + \
+               Glob('src/math/*.cpp') + \
+               Glob('src/pingus/*.cpp') + \
+               Glob('src/pingus/actions/*.cpp') + \
+               Glob('src/pingus/colliders/*.cpp') + \
+               Glob('src/pingus/components/*.cpp') + \
+               Glob('src/pingus/movers/*.cpp') + \
+               Glob('src/pingus/particles/*.cpp') + \
+               Glob('src/pingus/screens/*.cpp') + \
+               Glob('src/pingus/worldmap/*.cpp') + \
+               Glob('src/pingus/worldobjs/*.cpp') + \
+               Glob('src/util/*.cpp') + \
+               Glob('src/win32/*.cpp')
+
+env.Append(CPPDEFINES=[('VERSION', '"\\"0.7.4\\""'), 'WIN32'])
+env.Append(CPPPATH=['external/tinygettext'])
+env.Program("pingus-win32", pingus_sources)
+
+# EOF #
=======================================
--- /dev/null
+++ /SConstruct.win32   Tue Oct 11 14:42:55 2011
@@ -0,0 +1,5 @@
+CacheDir('cache')
+
+SConscript('SConscript.win32', variant_dir='build-win32', duplicate=0)
+
+# EOF #
=======================================
--- /.gitignore Mon Oct  3 13:20:38 2011
+++ /.gitignore Tue Oct 11 14:42:55 2011
@@ -2,6 +2,7 @@
 /.sconsign.dblite
 /cache
 /build
+/build-win32
 /config.log
 *~
 *.o
=======================================
--- /src/engine/input/event.hpp Wed Sep  7 04:00:46 2011
+++ /src/engine/input/event.hpp Tue Oct 11 14:42:55 2011
@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>

-#include <SDL/SDL_keyboard.h>
-#include <SDL/SDL_events.h>
+#include <SDL_keyboard.h>
+#include <SDL_events.h>

 namespace Input {

=======================================
--- /src/main.cpp       Thu Sep  8 20:09:11 2011
+++ /src/main.cpp       Tue Oct 11 14:42:55 2011
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.

+#include <SDL.h>
+
 #include "pingus/pingus_main.hpp"

 int main(int argc, char** argv)
=======================================
--- /src/pingus/server.cpp      Tue Sep  6 04:40:07 2011
+++ /src/pingus/server.cpp      Tue Oct 11 14:42:55 2011
@@ -17,6 +17,7 @@
 #include "pingus/server.hpp"

 #include <fstream>
+#include <time.h>

 #include "pingus/goal_manager.hpp"
 #include "pingus/pingu.hpp"
=======================================
--- /src/util/system.cpp        Wed Sep 28 10:50:57 2011
+++ /src/util/system.cpp        Tue Oct 11 14:42:55 2011
@@ -46,6 +46,7 @@
 #include "util/log.hpp"
 #include "util/pathname.hpp"
 #include "util/raise_exception.hpp"
+#include "util/string_util.hpp"

 std::string System::userdir;
 std::string System::default_email;
@@ -661,7 +662,7 @@

 #ifdef WIN32
   // FIXME: not save
-  std::ofstream out(pathname);
+  std::ofstream out(filename);
   out.write(content.data(), content.size());
 #else
   // build the filename: "/home/foo/outfile.pngXXXXXX"