diff -Nru maxishoot2-1.0.1+oneiric1/ChangeLog maxishoot2-1.0.2+oneiric1/ChangeLog
--- maxishoot2-1.0.1+oneiric1/ChangeLog	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/ChangeLog	2013-05-01 13:12:52.000000000 +0000
@@ -1,3 +1,4 @@
-2012-12-03 Colin GILLE / congelli501 <colingille@hotmail.com>
+2013-05-01 Colin GILLE / congelli501 <colingille@hotmail.com>
 
-	* maxishoot2: Fix build under GCC 4.7
+	* maxishoot2: Fix build of SPARK Particle Engine
+	* maxishoot2: New version of SPARK Particle Engine
diff -Nru maxishoot2-1.0.1+oneiric1/Makefile.in maxishoot2-1.0.2+oneiric1/Makefile.in
--- maxishoot2-1.0.1+oneiric1/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -76,11 +59,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -221,8 +199,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -355,11 +333,8 @@
 	-rm -f libtool config.lt
 install-pkgdocDATA: $(pkgdoc_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdocdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdocdir)"
 	@list='$(pkgdoc_DATA)'; test -n "$(pkgdocdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdocdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdocdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -544,10 +519,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -633,7 +611,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff -Nru maxishoot2-1.0.1+oneiric1/acinclude.m4 maxishoot2-1.0.2+oneiric1/acinclude.m4
--- maxishoot2-1.0.1+oneiric1/acinclude.m4	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/acinclude.m4	2013-05-01 13:12:52.000000000 +0000
@@ -118,15 +118,13 @@
 
 AC_DEFUN([MY_FIND_OPENGL],
 [
-	dnl OpenGL header
-	AM_CHECK_LIB_HEADER([GL], [gl], [GL/gl.h], [], [], AC_MSG_ERROR([	/!\ This programme requires OpenGL headers !]))
-
 	dnl OpenGL WIN32 & MAC
-	if test "$IS_MINGW" = 'true'; then
-			dnl intl (gettext)
-		AM_CHECK_LIB_HEADER([OGLWIN], [], [], [opengl32 glu32], [], [AC_MSG_ERROR([	/!\ This programme requires intl (gettext) !])])
+	if test "$IS_LINUX" = 'true'; then
+		AM_CHECK_LIB_HEADER([GL], [gl], [GL/gl.h], [GL], [], AC_MSG_ERROR([	/!\ This programme requires OpenGL !]))
+	elif test "$IS_MINGW" = 'true'; then
+		AM_CHECK_LIB_HEADER([GL], [gl], [GL/gl.h], [opengl32 glu32], [], [AC_MSG_ERROR([	/!\ This programme requires OpenGL (opengl32 glu32) !])])
 	elif test "$IS_MAC" = 'true'; then
-		CHECK_FRAMEWORK_LIST([SFML], [OpenGL GLUT])
+		CHECK_FRAMEWORK_LIST([OGLMAC], [OpenGL GLUT])
 	fi
 ])
 
diff -Nru maxishoot2-1.0.1+oneiric1/aclocal.m4 maxishoot2-1.0.2+oneiric1/aclocal.m4
--- maxishoot2-1.0.1+oneiric1/aclocal.m4	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/aclocal.m4	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -8804,7 +8804,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8820,7 +8820,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nru maxishoot2-1.0.1+oneiric1/configure maxishoot2-1.0.2+oneiric1/configure
--- maxishoot2-1.0.1+oneiric1/configure	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/configure	2013-05-01 13:12:52.000000000 +0000
@@ -1,9 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for maxishoot2 1.0.1.
+# Generated by GNU Autoconf 2.68 for maxishoot2 1.0.2.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -132,31 +134,6 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -190,8 +167,7 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -244,25 +220,21 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -364,14 +336,6 @@
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -493,10 +457,6 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -531,16 +491,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -552,8 +512,28 @@
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -587,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='maxishoot2'
 PACKAGE_TARNAME='maxishoot2'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='maxishoot2 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='maxishoot2 1.0.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -641,8 +621,8 @@
 BOOST_CFLAGS
 SFML_CFLAGS
 SFML_LIBS
-OGLWIN_LIBS
-OGLWIN_CFLAGS
+OGLMAC_CFLAGS
+OGLMAC_LIBS
 CFLAGS_ALL
 LIBS_ALL
 GL_LIBS
@@ -812,8 +792,6 @@
 PKG_CONFIG_LIBDIR
 GL_CFLAGS
 GL_LIBS
-OGLWIN_CFLAGS
-OGLWIN_LIBS
 SFML_CFLAGS
 SFML_LIBS
 BOOST_CFLAGS
@@ -1277,6 +1255,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1362,7 +1342,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures maxishoot2 1.0.1 to adapt to many kinds of systems.
+\`configure' configures maxishoot2 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1432,7 +1412,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of maxishoot2 1.0.1:";;
+     short | recursive ) echo "Configuration of maxishoot2 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1477,9 +1457,6 @@
               path overriding pkg-config's built-in search path
   GL_CFLAGS   C compiler flags for GL, overriding pkg-config
   GL_LIBS     linker flags for GL, overriding pkg-config
-  OGLWIN_CFLAGS
-              C compiler flags for OGLWIN, overriding pkg-config
-  OGLWIN_LIBS linker flags for OGLWIN, overriding pkg-config
   SFML_CFLAGS C compiler flags for SFML, overriding pkg-config
   SFML_LIBS   linker flags for SFML, overriding pkg-config
   BOOST_CFLAGS
@@ -1556,10 +1533,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-maxishoot2 configure 1.0.1
-generated by GNU Autoconf 2.69
+maxishoot2 configure 1.0.2
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1710,7 +1687,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1933,7 +1910,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
+	 $as_test_x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2042,8 +2019,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by maxishoot2 $as_me 1.0.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+It was created by maxishoot2 $as_me 1.0.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2459,7 +2436,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2628,7 +2605,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2668,7 +2645,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2719,7 +2696,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2772,7 +2749,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2858,7 +2835,7 @@
 
 # Define the identity of the package.
  PACKAGE='maxishoot2'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2951,7 +2928,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2995,7 +2972,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3643,7 +3620,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3683,7 +3660,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3736,7 +3713,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3777,7 +3754,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3835,7 +3812,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3879,7 +3856,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4075,7 +4052,8 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4624,7 +4602,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4700,7 +4678,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4766,7 +4744,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4833,7 +4811,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5089,7 +5067,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5133,7 +5111,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5546,7 +5524,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5586,7 +5564,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5892,7 +5870,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5932,7 +5910,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6036,7 +6014,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6080,7 +6058,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6205,7 +6183,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6245,7 +6223,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6304,7 +6282,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6344,7 +6322,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6994,7 +6972,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7034,7 +7012,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7114,7 +7092,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7154,7 +7132,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7206,7 +7184,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7246,7 +7224,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7298,7 +7276,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7338,7 +7316,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7390,7 +7368,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7430,7 +7408,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7482,7 +7460,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7522,7 +7500,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15296,6 +15274,7 @@
 
 
 
+		if test "$IS_LINUX" = 'true'; then
 
 	declare GL_CFLAGS=''
 	declare GL_LIBS=''
@@ -15329,11 +15308,11 @@
 	while test "$isLastField" -eq 0; do
 		toTestLibsList=''
 
-		if ! echo "" | grep '@' > '/dev/null'; then
+		if ! echo "GL" | grep '@' > '/dev/null'; then
 						isLastField=1
-			toTestLibsList=""
+			toTestLibsList="GL"
 		else
-			toTestLibsList="$(echo  | cut -d'@' -f$fieldId)"
+			toTestLibsList="$(echo GL | cut -d'@' -f$fieldId)"
 		fi
 
 		if test -n "$toTestLibsList"; then
@@ -15389,7 +15368,7 @@
 		else
 			isLastField=1 			libsList=''
 
-			if test -n ""; then
+			if test -n "GL"; then
 								libsOk=0
 			else
 								libsOk=1
@@ -15435,7 +15414,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15478,7 +15457,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15621,15 +15600,15 @@
 fi
 
 			if test "$headerOk" -eq 0 || test "$libsOk" -eq 0; then
-								as_fn_error $? "	/!\ This programme requires OpenGL headers !" "$LINENO" 5
-				true # We need a command if as_fn_error $? "	/!\ This programme requires OpenGL headers !" "$LINENO" 5 is empty
+								as_fn_error $? "	/!\ This programme requires OpenGL !" "$LINENO" 5
+				true # We need a command if as_fn_error $? "	/!\ This programme requires OpenGL !" "$LINENO" 5 is empty
 			else
 
 				true # We need a command if  is empty
 			fi
 		else
-						as_fn_error $? "	/!\ This programme requires OpenGL headers !" "$LINENO" 5
-			true # We need a command if as_fn_error $? "	/!\ This programme requires OpenGL headers !" "$LINENO" 5 is empty
+						as_fn_error $? "	/!\ This programme requires OpenGL !" "$LINENO" 5
+			true # We need a command if as_fn_error $? "	/!\ This programme requires OpenGL !" "$LINENO" 5 is empty
 		fi
 	else
 				GL_LIBS=$libsList
@@ -15646,14 +15625,13 @@
 	CFLAGS_ALL=$CFLAGS_ALL
 
 
+	elif test "$IS_MINGW" = 'true'; then
 
-		if test "$IS_MINGW" = 'true'; then
-
-	declare OGLWIN_CFLAGS=''
-	declare OGLWIN_LIBS=''
+	declare GL_CFLAGS=''
+	declare GL_LIBS=''
 
 			headerOk=1
-	for headerName in ; do
+	for headerName in GL/gl.h; do
 		for ac_header in $headerName
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -15759,7 +15737,7 @@
 
 
 		if test "$headerOk" -eq 0 || test "$libsOk" -eq 0; then
-		if test -n ""; then
+		if test -n "gl"; then
 
 
 
@@ -15787,7 +15765,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15830,7 +15808,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15882,19 +15860,19 @@
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGLWIN" >&5
-$as_echo_n "checking for OGLWIN... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
+$as_echo_n "checking for GL... " >&6; }
 
-if test -n "$OGLWIN_CFLAGS"; then
-    pkg_cv_OGLWIN_CFLAGS="$OGLWIN_CFLAGS"
+if test -n "$GL_CFLAGS"; then
+    pkg_cv_GL_CFLAGS="$GL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gl") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_OGLWIN_CFLAGS=`$PKG_CONFIG --cflags "" 2>/dev/null`
+  pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "gl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15902,16 +15880,16 @@
  else
     pkg_failed=untried
 fi
-if test -n "$OGLWIN_LIBS"; then
-    pkg_cv_OGLWIN_LIBS="$OGLWIN_LIBS"
+if test -n "$GL_LIBS"; then
+    pkg_cv_GL_LIBS="$GL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gl") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_OGLWIN_LIBS=`$PKG_CONFIG --libs "" 2>/dev/null`
+  pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "gl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -15932,22 +15910,22 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        OGLWIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "" 2>&1`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gl" 2>&1`
         else
-	        OGLWIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "" 2>&1`
+	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gl" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$OGLWIN_PKG_ERRORS" >&5
+	echo "$GL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements () were not met:
+	as_fn_error $? "Package requirements (gl) were not met:
 
-$OGLWIN_PKG_ERRORS
+$GL_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables OGLWIN_CFLAGS
-and OGLWIN_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GL_CFLAGS
+and GL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -15958,43 +15936,43 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables OGLWIN_CFLAGS
-and OGLWIN_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GL_CFLAGS
+and GL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	OGLWIN_CFLAGS=$pkg_cv_OGLWIN_CFLAGS
-	OGLWIN_LIBS=$pkg_cv_OGLWIN_LIBS
+	GL_CFLAGS=$pkg_cv_GL_CFLAGS
+	GL_LIBS=$pkg_cv_GL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	headerOk=1; libsOk=1
 fi
 
 			if test "$headerOk" -eq 0 || test "$libsOk" -eq 0; then
-								as_fn_error $? "	/!\ This programme requires intl (gettext) !" "$LINENO" 5
-				true # We need a command if AC_MSG_ERROR([	/!\ This programme requires intl (gettext) !]) is empty
+								as_fn_error $? "	/!\ This programme requires OpenGL (opengl32 glu32) !" "$LINENO" 5
+				true # We need a command if AC_MSG_ERROR([	/!\ This programme requires OpenGL (opengl32 glu32) !]) is empty
 			else
 
 				true # We need a command if  is empty
 			fi
 		else
-						as_fn_error $? "	/!\ This programme requires intl (gettext) !" "$LINENO" 5
-			true # We need a command if AC_MSG_ERROR([	/!\ This programme requires intl (gettext) !]) is empty
+						as_fn_error $? "	/!\ This programme requires OpenGL (opengl32 glu32) !" "$LINENO" 5
+			true # We need a command if AC_MSG_ERROR([	/!\ This programme requires OpenGL (opengl32 glu32) !]) is empty
 		fi
 	else
-				OGLWIN_LIBS=$libsList
+				GL_LIBS=$libsList
 
-		OGLWIN_CFLAGS=''
+		GL_CFLAGS=''
 
 
 	fi
 
-		LIBS_ALL="$LIBS_ALL ${OGLWIN_LIBS}"
+		LIBS_ALL="$LIBS_ALL ${GL_LIBS}"
 	LIBS_ALL=$LIBS_ALL
 
-	CFLAGS_ALL="$CFLAGS_ALL ${OGLWIN_CFLAGS}"
+	CFLAGS_ALL="$CFLAGS_ALL ${GL_CFLAGS}"
 	CFLAGS_ALL=$CFLAGS_ALL
 
 
@@ -16002,8 +15980,8 @@
 
 	frameworkPathList="/System/Library/Frameworks /Library/Frameworks"
 
-	declare SFML_CFLAGS=''
-	declare SFML_LIBS=''
+	declare OGLMAC_CFLAGS=''
+	declare OGLMAC_LIBS=''
 
 	frameworksOk=1
 	frameworksList=''
@@ -16063,15 +16041,15 @@
 	done
 
 		if test "$frameworksOk" -eq 1; then
-		SFML_LIBS=$frameworksList
+		OGLMAC_LIBS=$frameworksList
 
-		SFML_CFLAGS=$frameworksList
+		OGLMAC_CFLAGS=$frameworksList
 
 
-				LIBS_ALL="$LIBS_ALL ${SFML_LIBS}"
+				LIBS_ALL="$LIBS_ALL ${OGLMAC_LIBS}"
 		LIBS_ALL=$LIBS_ALL
 
-		CFLAGS_ALL="$CFLAGS_ALL ${SFML_CFLAGS}"
+		CFLAGS_ALL="$CFLAGS_ALL ${OGLMAC_CFLAGS}"
 		CFLAGS_ALL=$CFLAGS_ALL
 
 	else
@@ -16220,7 +16198,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16263,7 +16241,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16652,7 +16630,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16695,7 +16673,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17005,7 +16983,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17048,7 +17026,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17357,7 +17335,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17400,7 +17378,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17710,7 +17688,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17753,7 +17731,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -18422,16 +18400,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -18491,16 +18469,28 @@
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -18521,8 +18511,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by maxishoot2 $as_me 1.0.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by maxishoot2 $as_me 1.0.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18587,11 +18577,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-maxishoot2 config.status 1.0.1
-configured by $0, generated by GNU Autoconf 2.69,
+maxishoot2 config.status 1.0.2
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18682,7 +18672,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff -Nru maxishoot2-1.0.1+oneiric1/configure.in maxishoot2-1.0.2+oneiric1/configure.in
--- maxishoot2-1.0.1+oneiric1/configure.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/configure.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT(maxishoot2, 1.0.1)
+AC_INIT(maxishoot2, 1.0.2)
 AC_CONFIG_SRCDIR([src])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
diff -Nru maxishoot2-1.0.1+oneiric1/debian/Makefile.in maxishoot2-1.0.2+oneiric1/debian/Makefile.in
--- maxishoot2-1.0.1+oneiric1/debian/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/debian/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,11 +46,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -132,8 +110,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff -Nru maxishoot2-1.0.1+oneiric1/debian/changelog maxishoot2-1.0.2+oneiric1/debian/changelog
--- maxishoot2-1.0.1+oneiric1/debian/changelog	2012-12-03 07:23:05.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/debian/changelog	2013-05-01 13:14:40.000000000 +0000
@@ -1,5 +1,6 @@
-maxishoot2 (1.0.1+oneiric1) oneiric; urgency=low
+maxishoot2 (1.0.2+oneiric1) oneiric; urgency=low
 
-  * Fix build under GCC 4.7
+  * Fix build of SPARK Particle Engine
+  * New version of SPARK Particle Engine
 
- -- Colin GILLE / congelli501 <colingille@hotmail.com>  Mon, 03 Dec 2012 07:59:44 +0100
+ -- Colin GILLE / congelli501 <colingille@hotmail.com>  Wed, 01 May 2013 15:10:17 +0200
diff -Nru maxishoot2-1.0.1+oneiric1/debian/copyright maxishoot2-1.0.2+oneiric1/debian/copyright
--- maxishoot2-1.0.1+oneiric1/debian/copyright	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/debian/copyright	2013-05-01 13:12:52.000000000 +0000
@@ -1,6 +1,6 @@
 This package was created debianized by 
 Colin GILLE / congelli501 <colingille@hotmail.com> on
-Mon, 03 Dec 2012 07:59:44 +0100.
+Wed, 01 May 2013 15:10:17 +0200.
 
 Upstream Author(s): 
 
diff -Nru maxishoot2-1.0.1+oneiric1/innoSetup/Makefile.in maxishoot2-1.0.2+oneiric1/innoSetup/Makefile.in
--- maxishoot2-1.0.1+oneiric1/innoSetup/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/innoSetup/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,11 +46,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -132,8 +110,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff -Nru maxishoot2-1.0.1+oneiric1/innoSetup/setup.iss maxishoot2-1.0.2+oneiric1/innoSetup/setup.iss
--- maxishoot2-1.0.1+oneiric1/innoSetup/setup.iss	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/innoSetup/setup.iss	2013-05-01 13:12:52.000000000 +0000
@@ -26,7 +26,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{A4E48052-211A-4178-92F1-77152A79E893}
 AppName=Maxishoot 2
-AppVerName=Maxishoot 2 1.0.1
+AppVerName=Maxishoot 2 1.0.2
 AppPublisher=Congelli 501 / Colin GILLE
 AppPublisherURL=http://congelli.kelio.org/
 AppSupportURL=http://congelli.kelio.org/
diff -Nru maxishoot2-1.0.1+oneiric1/src/Makefile.in maxishoot2-1.0.2+oneiric1/src/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -138,11 +121,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -270,8 +248,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -478,11 +456,8 @@
 	-rm -f config.hpp stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -593,18 +568,11 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -815,10 +783,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/config.hpp maxishoot2-1.0.2+oneiric1/src/config.hpp
--- maxishoot2-1.0.1+oneiric1/src/config.hpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/config.hpp	2013-05-01 13:12:52.000000000 +0000
@@ -51,7 +51,7 @@
 #define PACKAGE_NAME "Bottle2D"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "maxishoot2 1.0.1"
+#define PACKAGE_STRING "maxishoot2 1.0.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "maxishoot2"
@@ -60,10 +60,10 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.1"
+#define PACKAGE_VERSION "1.0.2"
 
 /* Define to 1 if you have the ANSI C header files. */
 /* #undef STDC_HEADERS */
 
 /* Version number of package */
-#define VERSION "1.0.1"
+#define VERSION "1.0.2"
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/common/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/common/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/common/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/common/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/common' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/common/guiLib/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/common/guiLib/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/common/guiLib/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/common/guiLib/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/common/guiLib' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Logo/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Logo/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Logo/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Logo/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Logo' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,23 +17,6 @@
 
 # ---- Makefile.am, 'data/modes' ----
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,11 +55,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -174,8 +152,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -462,10 +440,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/images' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/enemies/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/enemies/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/enemies/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/enemies/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/images/enemies' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/store/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/store/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/images/store/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/images/store/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/images/store' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/locale' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/fr/LC_MESSAGES/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/fr/LC_MESSAGES/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/fr/LC_MESSAGES/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/fr/LC_MESSAGES/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/locale/fr/LC_MESSAGES' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/fr/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/fr/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/locale/fr/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/locale/fr/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,23 +17,6 @@
 
 # ---- Makefile.am, 'data/modes/Maxishoot2/locale/fr' ----
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,11 +55,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -174,8 +152,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -462,10 +440,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/music/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/music/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/music/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/music/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/music' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/scripts/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/scripts/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/scripts/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/scripts/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/scripts' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/sfx/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/sfx/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/sfx/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/sfx/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/sfx' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/sounds/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/sounds/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Maxishoot2/sounds/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Maxishoot2/sounds/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Maxishoot2/sounds' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/images/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/images/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/images/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/images/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu/images' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu/locale' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -73,11 +56,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -207,8 +185,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -330,11 +308,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -517,10 +492,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/fr/LC_MESSAGES/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/fr/LC_MESSAGES/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/fr/LC_MESSAGES/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/fr/LC_MESSAGES/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu/locale/fr/LC_MESSAGES' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/fr/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/fr/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/locale/fr/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/locale/fr/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,23 +17,6 @@
 
 # ---- Makefile.am, 'data/modes/Menu/locale/fr' ----
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,11 +55,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -174,8 +152,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -462,10 +440,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/scripts/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/scripts/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/scripts/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/scripts/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu/scripts' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/sounds/Makefile.in maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/sounds/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/data/modes/Menu/sounds/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/data/modes/Menu/sounds/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # ---- Makefile.am, 'data/modes/Menu/sounds' ----
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/doc/Makefile.in maxishoot2-1.0.2+oneiric1/src/doc/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/doc/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/doc/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -71,11 +54,6 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -205,8 +183,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -328,11 +306,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -515,10 +490,13 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/doc/html/Makefile.in maxishoot2-1.0.2+oneiric1/src/doc/html/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/doc/html/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/doc/html/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 # Subdirs:
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,11 +49,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -167,8 +145,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -287,11 +265,8 @@
 	-rm -rf .libs _libs
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/linux-menu/Makefile.in maxishoot2-1.0.2+oneiric1/src/linux-menu/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/linux-menu/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/linux-menu/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -64,11 +47,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -162,8 +140,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -286,11 +264,8 @@
 	-rm -rf .libs _libs
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -307,11 +282,8 @@
 	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
 	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pixmapdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff -Nru maxishoot2-1.0.1+oneiric1/src/luabind/Makefile.in maxishoot2-1.0.2+oneiric1/src/luabind/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/luabind/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/luabind/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -98,11 +81,6 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libluabind_la_SOURCES)
 DIST_SOURCES = $(libluabind_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -169,8 +147,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/Makefile.am maxishoot2-1.0.2+oneiric1/src/spark/Makefile.am
--- maxishoot2-1.0.1+oneiric1/src/spark/Makefile.am	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/Makefile.am	2013-05-01 13:12:52.000000000 +0000
@@ -2,134 +2,136 @@
 
 noinst_LTLIBRARIES=libspark.la
 
-libspark_la_LDFLAGS=-version-info 1:05:04 \
+libspark_la_LDFLAGS=-version-info 1:5:5 \
 			-static
 
 libspark_la_SOURCES=src/SPK_All.cpp src/SPK_GL_All.cpp src/SPK_SFML_All.cpp
 
 EXTRA_DIST = 	$(srcdir)/version \
-				$(srcdir)/include/SPK.h \
-				$(srcdir)/include/SPK_IRR.h \
-				$(srcdir)/include/SPK_SFML.h \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRSystem.cpp \
+				$(srcdir)/src/SPK_IRR_ALL.cpp \
+				$(srcdir)/src/SPK_GL_All.cpp \
+				$(srcdir)/src/SPK_SFML_All.cpp \
+				$(srcdir)/src/SPK_All.cpp \
+				$(srcdir)/src/Core/SPK_Transformable.cpp \
+				$(srcdir)/src/Core/SPK_Particle.cpp \
+				$(srcdir)/src/Core/SPK_Registerable.cpp \
+				$(srcdir)/src/Core/SPK_Modifier.cpp \
+				$(srcdir)/src/Core/SPK_Group.cpp \
+				$(srcdir)/src/Core/SPK_Zone.cpp \
+				$(srcdir)/src/Core/SPK_Vector3D.cpp \
+				$(srcdir)/src/Core/SPK_Renderer.cpp \
+				$(srcdir)/src/Core/SPK_BufferHandler.cpp \
+				$(srcdir)/src/Core/SPK_Interpolator.cpp \
+				$(srcdir)/src/Core/SPK_Model.cpp \
+				$(srcdir)/src/Core/SPK_Emitter.cpp \
+				$(srcdir)/src/Core/SPK_System.cpp \
+				$(srcdir)/src/Core/SPK_DEF.cpp \
+				$(srcdir)/src/Core/SPK_Factory.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_AABox.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Ring.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Sphere.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Plane.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Point.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Cylinder.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Line.cpp \
+				$(srcdir)/src/Extensions/Renderers/SPK_QuadRendererInterface.cpp \
+				$(srcdir)/src/Extensions/Renderers/SPK_Oriented3DRendererInterface.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Collision.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_PointMass.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Obstacle.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_ModifierGroup.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Vortex.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Destroyer.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_LinearForce.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_StraightEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_NormalEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_RandomEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_SphericEmitter.cpp \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_DEF.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLSystem.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_GLOBAL.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRR_DEF.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h \
 				$(srcdir)/include/SPK_GL.h \
+				$(srcdir)/include/SPK_SFML.h \
+				$(srcdir)/include/SPK_IRR.h \
+				$(srcdir)/include/Core/SPK_Interpolator.h \
+				$(srcdir)/include/Core/SPK_System.h \
 				$(srcdir)/include/Core/SPK_Pool.h \
-				$(srcdir)/include/Core/SPK_Group.h \
-				$(srcdir)/include/Core/SPK_ArrayBuffer.h \
+				$(srcdir)/include/Core/SPK_RegWrapper.h \
+				$(srcdir)/include/Core/SPK_Renderer.h \
 				$(srcdir)/include/Core/SPK_Emitter.h \
-				$(srcdir)/include/Core/SPK_System.h \
-				$(srcdir)/include/Core/SPK_Modifier.h \
+				$(srcdir)/include/Core/SPK_Buffer.h \
+				$(srcdir)/include/Core/SPK_ArrayBuffer.h \
+				$(srcdir)/include/Core/SPK_Group.h \
 				$(srcdir)/include/Core/SPK_Transformable.h \
-				$(srcdir)/include/Core/SPK_RegWrapper.h \
 				$(srcdir)/include/Core/SPK_Factory.h \
 				$(srcdir)/include/Core/SPK_Particle.h \
-				$(srcdir)/include/Core/SPK_Renderer.h \
-				$(srcdir)/include/Core/SPK_BufferHandler.h \
-				$(srcdir)/include/Core/SPK_Zone.h \
-				$(srcdir)/include/Core/SPK_Registerable.h \
+				$(srcdir)/include/Core/SPK_Modifier.h \
 				$(srcdir)/include/Core/SPK_DEF.h \
-				$(srcdir)/include/Core/SPK_Interpolator.h \
-				$(srcdir)/include/Core/SPK_Model.h \
-				$(srcdir)/include/Core/SPK_Buffer.h \
 				$(srcdir)/include/Core/SPK_Vector3D.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRR_DEF.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_GLOBAL.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_DEF.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLSystem.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_StaticEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_SphericEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_RandomEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_StraightEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_NormalEmitter.h \
+				$(srcdir)/include/Core/SPK_Model.h \
+				$(srcdir)/include/Core/SPK_Zone.h \
+				$(srcdir)/include/Core/SPK_BufferHandler.h \
+				$(srcdir)/include/Core/SPK_Registerable.h \
+				$(srcdir)/include/SPK.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Plane.h \
+				$(srcdir)/include/Extensions/Zones/SPK_AABox.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Ring.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Sphere.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Cylinder.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Line.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Point.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_QuadRendererInterface.h \
-				$(srcdir)/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_LineRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_PointRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h \
+				$(srcdir)/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Collision.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_Obstacle.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_Destroyer.h \
+				$(srcdir)/include/Extensions/Modifiers/SPK_PointMass.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_ModifierGroup.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_LinearForce.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Vortex.h \
+				$(srcdir)/include/Extensions/Modifiers/SPK_Destroyer.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Rotator.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_PointMass.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Line.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Plane.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Sphere.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Ring.h \
-				$(srcdir)/include/Extensions/Zones/SPK_AABox.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Point.h \
-				$(srcdir)/src/SPK_IRR_ALL.cpp \
-				$(srcdir)/src/SPK_GL_All.cpp \
-				$(srcdir)/src/Core/SPK_Group.cpp \
-				$(srcdir)/src/Core/SPK_Particle.cpp \
-				$(srcdir)/src/Core/SPK_Emitter.cpp \
-				$(srcdir)/src/Core/SPK_System.cpp \
-				$(srcdir)/src/Core/SPK_Registerable.cpp \
-				$(srcdir)/src/Core/SPK_Zone.cpp \
-				$(srcdir)/src/Core/SPK_Model.cpp \
-				$(srcdir)/src/Core/SPK_Factory.cpp \
-				$(srcdir)/src/Core/SPK_DEF.cpp \
-				$(srcdir)/src/Core/SPK_Transformable.cpp \
-				$(srcdir)/src/Core/SPK_Interpolator.cpp \
-				$(srcdir)/src/Core/SPK_BufferHandler.cpp \
-				$(srcdir)/src/Core/SPK_Vector3D.cpp \
-				$(srcdir)/src/Core/SPK_Modifier.cpp \
-				$(srcdir)/src/Core/SPK_Renderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRSystem.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLPointRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLPointRenderer.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_NormalEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_StraightEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_RandomEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_SphericEmitter.cpp \
-				$(srcdir)/src/Extensions/Renderers/SPK_Oriented3DRendererInterface.cpp \
-				$(srcdir)/src/Extensions/Renderers/SPK_QuadRendererInterface.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Obstacle.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Vortex.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Collision.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Destroyer.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_ModifierGroup.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_LinearForce.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_PointMass.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Line.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_AABox.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Plane.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Sphere.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Ring.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Point.cpp \
-				$(srcdir)/src/SPK_SFML_All.cpp \
-				$(srcdir)/src/SPK_All.cpp
+				$(srcdir)/include/Extensions/Modifiers/SPK_Obstacle.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_NormalEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_RandomEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_SphericEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_StraightEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_StaticEmitter.h
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/Makefile.in maxishoot2-1.0.2+oneiric1/src/spark/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/spark/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -84,11 +67,6 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libspark_la_SOURCES)
 DIST_SOURCES = $(libspark_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -155,8 +133,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -235,136 +213,138 @@
 top_srcdir = @top_srcdir@
 INCLUDES = -Iinclude
 noinst_LTLIBRARIES = libspark.la
-libspark_la_LDFLAGS = -version-info 1:05:04 \
+libspark_la_LDFLAGS = -version-info 1:5:5 \
 			-static
 
 libspark_la_SOURCES = src/SPK_All.cpp src/SPK_GL_All.cpp src/SPK_SFML_All.cpp
 EXTRA_DIST = $(srcdir)/version \
-				$(srcdir)/include/SPK.h \
-				$(srcdir)/include/SPK_IRR.h \
-				$(srcdir)/include/SPK_SFML.h \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.cpp \
+				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRSystem.cpp \
+				$(srcdir)/src/SPK_IRR_ALL.cpp \
+				$(srcdir)/src/SPK_GL_All.cpp \
+				$(srcdir)/src/SPK_SFML_All.cpp \
+				$(srcdir)/src/SPK_All.cpp \
+				$(srcdir)/src/Core/SPK_Transformable.cpp \
+				$(srcdir)/src/Core/SPK_Particle.cpp \
+				$(srcdir)/src/Core/SPK_Registerable.cpp \
+				$(srcdir)/src/Core/SPK_Modifier.cpp \
+				$(srcdir)/src/Core/SPK_Group.cpp \
+				$(srcdir)/src/Core/SPK_Zone.cpp \
+				$(srcdir)/src/Core/SPK_Vector3D.cpp \
+				$(srcdir)/src/Core/SPK_Renderer.cpp \
+				$(srcdir)/src/Core/SPK_BufferHandler.cpp \
+				$(srcdir)/src/Core/SPK_Interpolator.cpp \
+				$(srcdir)/src/Core/SPK_Model.cpp \
+				$(srcdir)/src/Core/SPK_Emitter.cpp \
+				$(srcdir)/src/Core/SPK_System.cpp \
+				$(srcdir)/src/Core/SPK_DEF.cpp \
+				$(srcdir)/src/Core/SPK_Factory.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_AABox.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Ring.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Sphere.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Plane.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Point.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Cylinder.cpp \
+				$(srcdir)/src/Extensions/Zones/SPK_Line.cpp \
+				$(srcdir)/src/Extensions/Renderers/SPK_QuadRendererInterface.cpp \
+				$(srcdir)/src/Extensions/Renderers/SPK_Oriented3DRendererInterface.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Collision.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_PointMass.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Obstacle.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_ModifierGroup.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Vortex.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_Destroyer.cpp \
+				$(srcdir)/src/Extensions/Modifiers/SPK_LinearForce.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_StraightEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_NormalEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_RandomEmitter.cpp \
+				$(srcdir)/src/Extensions/Emitters/SPK_SphericEmitter.cpp \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_DEF.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLSystem.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_GLOBAL.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRR_DEF.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h \
+				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h \
 				$(srcdir)/include/SPK_GL.h \
+				$(srcdir)/include/SPK_SFML.h \
+				$(srcdir)/include/SPK_IRR.h \
+				$(srcdir)/include/Core/SPK_Interpolator.h \
+				$(srcdir)/include/Core/SPK_System.h \
 				$(srcdir)/include/Core/SPK_Pool.h \
-				$(srcdir)/include/Core/SPK_Group.h \
-				$(srcdir)/include/Core/SPK_ArrayBuffer.h \
+				$(srcdir)/include/Core/SPK_RegWrapper.h \
+				$(srcdir)/include/Core/SPK_Renderer.h \
 				$(srcdir)/include/Core/SPK_Emitter.h \
-				$(srcdir)/include/Core/SPK_System.h \
-				$(srcdir)/include/Core/SPK_Modifier.h \
+				$(srcdir)/include/Core/SPK_Buffer.h \
+				$(srcdir)/include/Core/SPK_ArrayBuffer.h \
+				$(srcdir)/include/Core/SPK_Group.h \
 				$(srcdir)/include/Core/SPK_Transformable.h \
-				$(srcdir)/include/Core/SPK_RegWrapper.h \
 				$(srcdir)/include/Core/SPK_Factory.h \
 				$(srcdir)/include/Core/SPK_Particle.h \
-				$(srcdir)/include/Core/SPK_Renderer.h \
-				$(srcdir)/include/Core/SPK_BufferHandler.h \
-				$(srcdir)/include/Core/SPK_Zone.h \
-				$(srcdir)/include/Core/SPK_Registerable.h \
+				$(srcdir)/include/Core/SPK_Modifier.h \
 				$(srcdir)/include/Core/SPK_DEF.h \
-				$(srcdir)/include/Core/SPK_Interpolator.h \
-				$(srcdir)/include/Core/SPK_Model.h \
-				$(srcdir)/include/Core/SPK_Buffer.h \
 				$(srcdir)/include/Core/SPK_Vector3D.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRR_DEF.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_GLOBAL.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFML_DEF.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLSystem.h \
-				$(srcdir)/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_StaticEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_SphericEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_RandomEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_StraightEmitter.h \
-				$(srcdir)/include/Extensions/Emitters/SPK_NormalEmitter.h \
+				$(srcdir)/include/Core/SPK_Model.h \
+				$(srcdir)/include/Core/SPK_Zone.h \
+				$(srcdir)/include/Core/SPK_BufferHandler.h \
+				$(srcdir)/include/Core/SPK_Registerable.h \
+				$(srcdir)/include/SPK.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Plane.h \
+				$(srcdir)/include/Extensions/Zones/SPK_AABox.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Ring.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Sphere.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Cylinder.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Line.h \
+				$(srcdir)/include/Extensions/Zones/SPK_Point.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_QuadRendererInterface.h \
-				$(srcdir)/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_LineRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_PointRendererInterface.h \
 				$(srcdir)/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h \
+				$(srcdir)/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Collision.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_Obstacle.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_Destroyer.h \
+				$(srcdir)/include/Extensions/Modifiers/SPK_PointMass.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_ModifierGroup.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_LinearForce.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Vortex.h \
+				$(srcdir)/include/Extensions/Modifiers/SPK_Destroyer.h \
 				$(srcdir)/include/Extensions/Modifiers/SPK_Rotator.h \
-				$(srcdir)/include/Extensions/Modifiers/SPK_PointMass.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Line.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Plane.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Sphere.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Ring.h \
-				$(srcdir)/include/Extensions/Zones/SPK_AABox.h \
-				$(srcdir)/include/Extensions/Zones/SPK_Point.h \
-				$(srcdir)/src/SPK_IRR_ALL.cpp \
-				$(srcdir)/src/SPK_GL_All.cpp \
-				$(srcdir)/src/Core/SPK_Group.cpp \
-				$(srcdir)/src/Core/SPK_Particle.cpp \
-				$(srcdir)/src/Core/SPK_Emitter.cpp \
-				$(srcdir)/src/Core/SPK_System.cpp \
-				$(srcdir)/src/Core/SPK_Registerable.cpp \
-				$(srcdir)/src/Core/SPK_Zone.cpp \
-				$(srcdir)/src/Core/SPK_Model.cpp \
-				$(srcdir)/src/Core/SPK_Factory.cpp \
-				$(srcdir)/src/Core/SPK_DEF.cpp \
-				$(srcdir)/src/Core/SPK_Transformable.cpp \
-				$(srcdir)/src/Core/SPK_Interpolator.cpp \
-				$(srcdir)/src/Core/SPK_BufferHandler.cpp \
-				$(srcdir)/src/Core/SPK_Vector3D.cpp \
-				$(srcdir)/src/Core/SPK_Modifier.cpp \
-				$(srcdir)/src/Core/SPK_Renderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/Irrlicht/SPK_IRRSystem.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLPointRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp \
-				$(srcdir)/src/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLLineRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp \
-				$(srcdir)/src/RenderingAPIs/SFML/SPK_SFMLPointRenderer.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_NormalEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_StraightEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_RandomEmitter.cpp \
-				$(srcdir)/src/Extensions/Emitters/SPK_SphericEmitter.cpp \
-				$(srcdir)/src/Extensions/Renderers/SPK_Oriented3DRendererInterface.cpp \
-				$(srcdir)/src/Extensions/Renderers/SPK_QuadRendererInterface.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Obstacle.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Vortex.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Collision.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_Destroyer.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_ModifierGroup.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_LinearForce.cpp \
-				$(srcdir)/src/Extensions/Modifiers/SPK_PointMass.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Line.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_AABox.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Plane.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Sphere.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Ring.cpp \
-				$(srcdir)/src/Extensions/Zones/SPK_Point.cpp \
-				$(srcdir)/src/SPK_SFML_All.cpp \
-				$(srcdir)/src/SPK_All.cpp
+				$(srcdir)/include/Extensions/Modifiers/SPK_Obstacle.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_NormalEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_RandomEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_SphericEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_StraightEmitter.h \
+				$(srcdir)/include/Extensions/Emitters/SPK_StaticEmitter.h
 
 all: all-am
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_ArrayBuffer.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_ArrayBuffer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_ArrayBuffer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_ArrayBuffer.h	2013-05-01 13:12:52.000000000 +0000
@@ -45,20 +45,20 @@
 		* @brief Gets the starting address of the inner array
 		* @return the starting address of the first element of the inner array
 		*/
-		inline T* getData() const;
+		T* getData() const;
 
 		/**
 		* @brief Gets the number of elements for a single particle
 		* @return the number of elements for a single particle
 		*/
-		inline const size_t getParticleSize() const;
+		const size_t getParticleSize() const;
 
 		/**
 		* @brief Gets the total number of T in the inner array
 		* The value is equal to <i>particleSize * nbParticles</i>.
 		* @return the total number of T in the inner array
 		*/
-		inline size_t getDataSize() const;
+		size_t getDataSize() const;
 
 	private :
 
@@ -119,7 +119,7 @@
 		particleSize(buffer.particleSize)
 	{
 		data = new T[dataSize];
-		memcpy(data,buffer.data,dataSize * sizeof(T));
+		std::memcpy(data,buffer.data,dataSize * sizeof(T));
 	}
 
 	template<class T>
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Buffer.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Buffer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Buffer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Buffer.h	2013-05-01 13:12:52.000000000 +0000
@@ -57,13 +57,13 @@
 		* @brief Gets the current flag of this buffer
 		* @return the current flag of this buffer
 		*/
-		inline unsigned int getFlag() const;
+		unsigned int getFlag() const;
 
 		/**
 		* @brief Tells whether data is swapped as particles in the group are swapped
 		* @return true if data must be swapped with particles, false if not
 		*/
-		inline bool isSwapEnabled() const;
+		bool isSwapEnabled() const;
 
 	protected :
 
@@ -98,6 +98,12 @@
 	{
 	friend class Group;
 
+	protected : 
+
+		virtual ~BufferCreator() {}
+
+	private :
+
 		/**
 		* @brief Creates a new buffer
 		*
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_BufferHandler.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_BufferHandler.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_BufferHandler.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_BufferHandler.h	2013-05-01 13:12:52.000000000 +0000
@@ -83,7 +83,7 @@
 		*
 		* @param group : the Group in which to create the buffers for this buffer handler
 		*/
-		virtual inline void createBuffers(const Group& group) {};
+		virtual void createBuffers(const Group& group) {};
 
 		/**
 		* @brief Destroys the buffers for this buffer handler in the given group
@@ -94,7 +94,7 @@
 		*
 		* @param group : the Group in which to destroy the buffers for this buffer handler
 		*/
-		virtual inline void destroyBuffers(const Group& group) {};
+		virtual void destroyBuffers(const Group& group) {};
 
 
 	protected :
@@ -129,7 +129,7 @@
 		* @param group : the group in which to check the buffers
 		* @return true if buffers are ready, false otherwise
 		*/
-		virtual inline bool checkBuffers(const Group& group);
+		virtual bool checkBuffers(const Group& group);
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Emitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Emitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Emitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Emitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -68,7 +68,7 @@
 		////////////////
 
 		/** @brief Destructor of Emitter */
-		virtual inline ~Emitter() {}
+		virtual ~Emitter() {}
 
 		/////////////
 		// Setters //
@@ -83,7 +83,7 @@
 		* @param active : true to activate this Emitter, false to deactivate it
 		* @since 1.05.00
 		*/
-		inline void setActive(bool active);
+		void setActive(bool active);
 
 		/**
 		* @brief Sets the number of particles in this Emitter's tank
@@ -95,7 +95,7 @@
 		*
 		* @param tank : the number of particles in this Emitters's tank
 		*/
-		inline void setTank(int tank);
+		void setTank(int tank);
 
 		/**
 		* @brief Changes the number of particles in this Emitters's tank
@@ -116,7 +116,7 @@
 		*
 		* @param flow : the flow of this Emitter
 		*/
-		inline void setFlow(float flow);
+		void setFlow(float flow);
 
 		/**
 		* @brief Changes the flow of particles of this Emitter
@@ -139,7 +139,7 @@
 		* @param min : the minimum force of the Emitter
 		* @param max : the maximum force of the Emitter
 		*/
-		inline void setForce(float min,float max);
+		void setForce(float min,float max);
 
 		/**
 		* @brief Sets the Zone of this Emitter
@@ -160,43 +160,43 @@
 		* @return true if this Emitter is active, false if is is inactive
 		* @since 1.05.00
 		*/
-		inline bool isActive() const;
+		bool isActive() const;
 
 		/**
 		* @brief Gets the number of particles in this Emitter's tank
 		* @return the number of particles in this Emitters's tanl
 		*/
-		inline int getTank() const;
+		int getTank() const;
 
 		/**
 		* @brief Gets the flow of this Emitter
 		* @return the flow of this Emitter
 		*/
-		inline float getFlow() const;
+		float getFlow() const;
 
 		/**
 		* @brief Gets the minimum force of this Emitter
 		* @return the minimum force of this Emitter
 		*/
-		inline float getForceMin() const;
+		float getForceMin() const;
 
 		/**
 		* @brief Gets the maximum force of this Emitter
 		* @return the maximum force of this Emitter
 		*/
-		inline float getForceMax() const;
+		float getForceMax() const;
 
 		/**
 		* @brief Gets the Zone of this Emitter
 		* @return the Zone of this Emitter
 		*/
-		inline Zone* getZone() const;
+		Zone* getZone() const;
 
 		/**
 		* @brief Tells whether this Emitter emits in the whole Zone or only at its borders
 		* @return true if this EMitter emits in the whole Zone, false if it is only at its borders
 		*/
-		inline bool isFullZone() const;
+		bool isFullZone() const;
 
 		/**
 		* @brief Tells whether this Emitter is sleeping or not
@@ -206,7 +206,7 @@
 		* @return true if this Emitter is sleeping, false if it is active
 		* @since 1.03.00
 		*/
-		inline bool isSleeping() const;
+		bool isSleeping() const;
 
 		///////////////
 		// Interface //
@@ -223,7 +223,7 @@
 		*
 		* @param particle : the Particle to emit from this Emitter
 		*/
-		inline void emit(Particle& particle) const;
+		void emit(Particle& particle) const;
 
 		/**
 		* @brief Generates the velocity of the Particle
@@ -233,17 +233,17 @@
 		*
 		* @param particle : the Particle whose velocity has to be updated
 		*/
-		inline void generateVelocity(Particle& particle) const;
+		void generateVelocity(Particle& particle) const;
 
 		virtual Registerable* findByName(const std::string& name);
 
 	protected :
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const Emitter& emitter,bool createBase);
+		virtual void copyChildren(const Registerable& object,bool createBase);
 		virtual void destroyChildren(bool keepChildren);
 
-		virtual inline void propagateUpdateTransform();
+		virtual void propagateUpdateTransform();
 
 	private :
 
@@ -350,7 +350,7 @@
 		generateVelocity(particle);
 	}
 
-	void Emitter::generateVelocity(Particle& particle) const
+	inline void Emitter::generateVelocity(Particle& particle) const
 	{
 		generateVelocity(particle,random(forceMin,forceMax) / particle.getParamCurrentValue(PARAM_MASS));
 	}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Factory.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Factory.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Factory.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Factory.h	2013-05-01 13:12:52.000000000 +0000
@@ -132,7 +132,7 @@
 		* @brief Returns the number of Regiterable objects registered in the SPKFactory
 		* @return the number of Regiterable objects registered in the SPKFactoty
 		*/
-		inline size_t getNbObjects() const;
+		size_t getNbObjects() const;
 
 		/**
 		* @brief Creates a registered Registerable from the passed Registerable
@@ -247,9 +247,9 @@
 
 		void traceObject(const std::map<SPK_ID,Registerable*>::iterator& it,bool nextLine);
 
-		inline bool isAlreadyProcessed(const Registerable* source);
-		inline Registerable* getProcessedObject(const Registerable* source);
-		inline void markAsProcessed(const Registerable* source,Registerable* object);
+		bool isAlreadyProcessed(const Registerable* source);
+		Registerable* getProcessedObject(const Registerable* source);
+		void markAsProcessed(const Registerable* source,Registerable* object);
 		
 		Registerable* registerObject(Registerable* object);
 		void unregisterObject(std::map<SPK_ID,Registerable*>::iterator& it,bool keepChildren = false);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Group.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Group.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Group.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Group.h	2013-05-01 13:12:52.000000000 +0000
@@ -92,7 +92,7 @@
 		* @return A new registered Group
 		* @since 1.04.00
 		*/
-		static inline Group* create(Model* model = NULL,size_t capacity = Pool<Particle>::DEFAULT_CAPACITY);
+		static Group* create(Model* model = NULL,size_t capacity = Pool<Particle>::DEFAULT_CAPACITY);
 
 		////////////////
 		// Destructor //
@@ -143,7 +143,7 @@
 		*
 		* @param friction the friction of the Group
 		*/
-		inline void setFriction(float friction);
+		void setFriction(float friction);
 
 		/**
 		* @brief Sets the gravity of this Group
@@ -156,7 +156,7 @@
 		*
 		* @param gravity : the Vector3D that will be used as the gravity for this Group
 		*/
-		inline void setGravity(const Vector3D& gravity);
+		void setGravity(const Vector3D& gravity);
 
 		/**
 		* @brief Assigns a callback for the custom update
@@ -173,7 +173,7 @@
 		*
 		* @param fupdate : A pointer to the callback function that will perform custom update for this Group
 		*/
-		inline void setCustomUpdate(bool (*fupdate)(Particle&,float));
+		void setCustomUpdate(bool (*fupdate)(Particle&,float));
 
 		/**
 		* @brief Assigns a callback for custom birth
@@ -185,7 +185,7 @@
 		*
 		* @param fbirth : A pointer to the callback function that will perform custom birth for this Group
 		*/
-		inline void setCustomBirth(void (*fbirth)(Particle&));
+		void setCustomBirth(void (*fbirth)(Particle&));
 
 		/**
 		* @brief Assigns a callback for custom death
@@ -197,7 +197,7 @@
 		*
 		* @param fdeath : A pointer to the callback function that will perform custom death for this Group
 		*/
-		inline void setCustomDeath(void (*fdeath)(Particle&));
+		void setCustomDeath(void (*fdeath)(Particle&));
 
 		/**
 		* @brief Enables or disables the sorting of particles
@@ -211,7 +211,7 @@
 		*
 		* @param sort : true to enable the sorting of particles, false otherwise
 		*/
-		inline void enableSorting(bool sort);
+		void enableSorting(bool sort);
 
 		/**
 		* @brief Enables or disables the computation of the distance of a Particle from the camera
@@ -226,7 +226,7 @@
 		* @param distanceComputation : true to enable the computation of the camera distance, false not to
 		* @since 1.01.00
 		*/
-		inline void enableDistanceComputation(bool distanceComputation);
+		void enableDistanceComputation(bool distanceComputation);
 
 		/**
 		* @brief Enables or disables the computation of the axis aligned bouding box of the Group
@@ -240,7 +240,7 @@
 		*
 		* @param AABB : true to enable the computing of the AABB of the Group, false to disable it
 		*/
-		inline void enableAABBComputing(bool AABB);
+		void enableAABBComputing(bool AABB);
 
 		/**
 		* @brief Enables or not Renderer buffers management in a statix way
@@ -266,7 +266,7 @@
 		*
 		* @return the Pool of the Group
 		*/
-		inline const Pool<Particle>& getParticles() const;
+		const Pool<Particle>& getParticles() const;
 
 		/**
 		* @brief Gets a single Particle in the Group by its index
@@ -277,7 +277,7 @@
 		* @param index : the position in the Group's Pool of the Particle to get
 		* @return : the Particle at index
 		*/
-		inline Particle& getParticle(size_t index);
+		Particle& getParticle(size_t index);
 
 		/**
 		* @brief Gets a single Particle in the Group by its index
@@ -288,63 +288,63 @@
 		* @return the Particle at index
 		* @since 1.02.00
 		*/
-		inline const Particle& getParticle(size_t index) const;
+		const Particle& getParticle(size_t index) const;
 
 		/**
 		* @brief Gets the number of particles in the Group
 		* @return the number of particles in the Group
 		*/
-		inline size_t getNbParticles() const;
+		size_t getNbParticles() const;
 
 		/**
 		* @brief Gets the emitters of the Group
 		* @return the vector of emitters of the Group
 		*/
-		inline const std::vector<Emitter*>& getEmitters() const;
+		const std::vector<Emitter*>& getEmitters() const;
 
 		/**
 		* @brief Gets an Emitter of the Group by its index
 		* @param index : the position in the vector of emitters of the Emitter to get
 		* @return : the Emitter at index
 		*/
-		inline Emitter* getEmitter(size_t index) const;
+		Emitter* getEmitter(size_t index) const;
 
 		/**
 		* @brief Gets the number of emitters in this Group
 		* @return the number of emitters in this Group
 		*/
-		inline size_t getNbEmitters() const;
+		size_t getNbEmitters() const;
 
 		/**
 		* @brief Gets the modifiers of the Group
 		* @return the vector of modifiers of the Group
 		*/
-		inline const std::vector<Modifier*>& getModifiers() const;
+		const std::vector<Modifier*>& getModifiers() const;
 
 		/**
 		* @brief Gets an Modifier of the Group by its index
 		* @param index : the position in the vector of modifiers of the Modifier to get
 		* @return : the Modifier at index
 		*/
-		inline Modifier* getModifier(size_t index) const;
+		Modifier* getModifier(size_t index) const;
 
 		/**
 		* @brief Gets the number of modifiers in this Group
 		* @return the number of modifiers in this Group
 		*/
-		inline size_t getNbModifiers() const;
+		size_t getNbModifiers() const;
 
 		/**
 		* @brief Gets the Model of this Group
 		* @return the Model of this Group
 		*/
-		inline Model* getModel() const;
+		Model* getModel() const;
 
 		/**
 		* @brief Gets the Renderer of this Group
 		* @return the Renderer of this Group
 		*/
-		inline Renderer* getRenderer() const;
+		Renderer* getRenderer() const;
 
 		/**
 		* @brief Gets the friction coefficient of this Group
@@ -353,7 +353,7 @@
 		*
 		* @return the friction coefficient of this Group
 		*/
-		inline float getFriction() const;
+		float getFriction() const;
 
 		/**
 		* @brief Gets the gravity Vector3D of this Group
@@ -362,7 +362,7 @@
 		*
 		* @return the gravity Vector3D of this Group
 		*/
-		inline const Vector3D& getGravity() const;
+		const Vector3D& getGravity() const;
 
 		/**
 		* @brief Tells whether the sorting of particles from back to front is enabled
@@ -371,14 +371,14 @@
 		*
 		* @return true if the sorting is enabled, false otherwise
 		*/
-		inline bool isSortingEnabled() const;
+		bool isSortingEnabled() const;
 
 		/**
 		* @brief Tells whether the distance computation between particles and camera is enabled
 		* @return true is the distance computation is enabled, false if not
 		* @since 1.01.00
 		*/
-		inline bool isDistanceComputationEnabled() const;
+		bool isDistanceComputationEnabled() const;
 
 		/**
 		* @brief Tells whether the computation of the axis aligned bouding box is enabled
@@ -387,7 +387,7 @@
 		*
 		* @return true if the computation of the AABB is enabled, false if it is disabled
 		*/
-		inline bool isAABBComputingEnabled() const;
+		bool isAABBComputingEnabled() const;
 
 		/**
 		* @brief Gets a Vector3D holding the minimum coordinates of the AABB of the Group.
@@ -396,7 +396,7 @@
 		*
 		* @return a Vector3D holding the minimum coordinates of the AABB of the Group
 		*/
-		inline const Vector3D& getAABBMin() const;
+		const Vector3D& getAABBMin() const;
 
 		/**
 		* @brief Gets a Vector3D holding the maximum coordinates of the AABB of the Group.
@@ -405,7 +405,7 @@
 		*
 		* @return a Vector3D holding the maximum coordinates of the AABB of the Group
 		*/
-		inline const Vector3D& getAABBMax() const;
+		const Vector3D& getAABBMax() const;
 
 		/**
 		* @brief Gets the start address of the given param
@@ -428,7 +428,7 @@
 		*
 		* @since 1.03.00
 		*/
-		inline const void* getPositionAddress() const;
+		const void* getPositionAddress() const;
 
 		/**
 		* @brief Gets the stride for parameters
@@ -448,7 +448,7 @@
 		*
 		* @since 1.03.00
 		*/
-		inline size_t getPositionStride() const;
+		size_t getPositionStride() const;
 
 		/**
 		* @brief Tells whether renderers buffer management is enabled or not
@@ -488,7 +488,7 @@
 		* @param position : the position where the Particles will be added
 		* @param velocity : the velocity of the Particles
 		*/
-		inline void addParticles(unsigned int nb,const Vector3D& position,const Vector3D& velocity);
+		void addParticles(unsigned int nb,const Vector3D& position,const Vector3D& velocity);
 
 		/**
 		* @brief Adds some Particles to this Group
@@ -512,7 +512,7 @@
 		* @param velocity : the velocity of the Particles
 		* @param full : true to generate a position within the whole Zonz, false only at its borders
 		*/
-		inline void addParticles(unsigned int nb,const Zone* zone,const Vector3D& velocity,bool full = true);
+		void addParticles(unsigned int nb,const Zone* zone,const Vector3D& velocity,bool full = true);
 
 		/**
 		* @brief Adds some Particles to this Group
@@ -523,7 +523,7 @@
 		* @param position : the position where the Particles will be added
 		* @param emitter : the Emitter that will be used to generate the velocity
 		*/
-		inline void addParticles(unsigned int nb,const Vector3D& position,Emitter* emitter);
+		void addParticles(unsigned int nb,const Vector3D& position,Emitter* emitter);
 
 		/**
 		* @brief Adds some Particles to this Group
@@ -609,7 +609,7 @@
 		*
 		* @param index : the position of the Particle in this Group
 		*/
-		inline void removeParticle(size_t index);
+		void removeParticle(size_t index);
 
 		/**
 		* @brief Adds an Emitter in this Group
@@ -797,7 +797,7 @@
 	protected :
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const Group& group,bool createBase);
+		virtual void copyChildren(const Registerable& object,bool createBase);
 		virtual void destroyChildren(bool keepChildren);
 
 		virtual void propagateUpdateTransform();
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Interpolator.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Interpolator.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Interpolator.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Interpolator.h	2013-05-01 13:12:52.000000000 +0000
@@ -78,7 +78,7 @@
 	};
 
     // forward declaration to allow the set of entries in interpolator to be constructed
-    inline bool operator<(const InterpolatorEntry& entry0,const InterpolatorEntry& entry1);
+    bool operator<(const InterpolatorEntry& entry0,const InterpolatorEntry& entry1);
 
 	/**
 	* @class Interpolator
@@ -147,7 +147,7 @@
 		* @param type : the type of value used to interpolate
 		* @param param : the parameter used to interpolate when the type is INTERPOLATOR_PARAM.
 		*/
-		inline void setType(InterpolationType type,ModelParam param = PARAM_SIZE);
+		void setType(InterpolationType type,ModelParam param = PARAM_SIZE);
 
 		/**
 		* @brief Enables or disables the looping of the graph
@@ -159,7 +159,7 @@
 		*
 		* @param loop : true to enabled the looping, false to disable it
 		*/
-		inline void enableLooping(bool loop);
+		void enableLooping(bool loop);
 
 		/**
 		* @brief Sets the scale variation in x
@@ -168,7 +168,7 @@
 		*
 		* @param scaleXVariation : the scale variation in x
 		*/
-		inline void setScaleXVariation(float scaleXVariation);
+		void setScaleXVariation(float scaleXVariation);
 
 		/**
 		* @brief Sets the offset variation in x
@@ -177,7 +177,7 @@
 		*
 		* @param offsetXVariation : the offset variation in x
 		*/
-		inline void setOffsetXVariation(float offsetXVariation);
+		void setOffsetXVariation(float offsetXVariation);
 
 		/////////////
 		// Getters //
@@ -187,7 +187,7 @@
 		* @brief Gets the type of value used to interpolate
 		* @return the type of value used to interpolate
 		*/
-		inline InterpolationType getType() const;
+		InterpolationType getType() const;
 
 		/**
 		* @brief Gets the parameter used to interpolate
@@ -196,37 +196,37 @@
 		*
 		* @return the parameter used to interpolate
 		*/
-		inline ModelParam getInterpolatorParam() const;
+		ModelParam getInterpolatorParam() const;
 
 		/**
 		* @brief Tells whether the looping is enabled or not
 		* @return true if the looping is enabled, false if not
 		*/
-		inline bool isLoopingEnabled() const;
+		bool isLoopingEnabled() const;
 
 		/**
 		* @brief Gets the scale variation along x
 		* @return the scale variation along x
 		*/
-		inline float getScaleXVariation() const;
+		float getScaleXVariation() const;
 
 		/**
 		* @brief Gets the offset variation along x
 		* @return the offset variation along x
 		*/
-		inline float getOffsetXVariation() const;
+		float getOffsetXVariation() const;
 
 		/**
 		* @brief Gets the graph of the interpolator
 		* @return the graph of the interpolator
 		*/
-		inline std::set<InterpolatorEntry>& getGraph();
+		std::set<InterpolatorEntry>& getGraph();
 
 		/**
 		* @brief Gets the graph of the interpolator (constant version)
 		* @return the graph of the interpolator
 		*/
-		inline const std::set<InterpolatorEntry>& getGraph() const;
+		const std::set<InterpolatorEntry>& getGraph() const;
 
 		///////////////
 		// Interface //
@@ -237,7 +237,7 @@
 		* @param entry : the entry to add to the graph
 		* @return true if the entry has been added to the graph, false if not (the graph already contains an entry with the same x)
 		*/
-		inline bool addEntry(const InterpolatorEntry& entry);
+		bool addEntry(const InterpolatorEntry& entry);
 
 		/**
 		* @brief Adds an entry to the graph
@@ -245,7 +245,7 @@
 		* @param y : the y of the entry to add (y0 and y1 are set to y)
 		* @return true if the entry has been added to the graph, false if not (the graph already contains an entry with the same x)
 		*/
-		inline bool addEntry(float x,float y);
+		bool addEntry(float x,float y);
 
 		/**
 		* @brief Adds an entry to the graph
@@ -254,10 +254,10 @@
 		* @param y1 : the y1 of the entry to add
 		* @return true if the entry has been added to the graph, false if not (the graph already contains an entry with the same x)
 		*/
-		inline bool addEntry(float x,float y0,float y1);
+		bool addEntry(float x,float y0,float y1);
 
 		/** @brief Clears the graph (removes all the entries) */
-		inline void clearGraph();
+		void clearGraph();
 
 		/**
 		* @brief Generates a sinusoidal curve
@@ -285,7 +285,7 @@
 		float offsetXVariation;
 
 		float interpolate(const Particle& particle,ModelParam interpolatedParam,float ratioY,float offsetX,float scaleX);
-		inline float interpolateY(const InterpolatorEntry& entry,float ratio);
+		float interpolateY(const InterpolatorEntry& entry,float ratio);
 
 		// methods to compute X
 		typedef float (Interpolator::*computeXFn)(const Particle&) const;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Model.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Model.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Model.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Model.h	2013-05-01 13:12:52.000000000 +0000
@@ -138,7 +138,7 @@
 		* @return A new registered Model
 		* @since 1.04.00
 		*/
-		static inline Model* create(int enableFlag = FLAG_RED | FLAG_GREEN | FLAG_BLUE,int mutableFlag = FLAG_NONE,int randomFlag = FLAG_NONE,int interpolatedFlag = FLAG_NONE);
+		static Model* create(int enableFlag = FLAG_RED | FLAG_GREEN | FLAG_BLUE,int mutableFlag = FLAG_NONE,int randomFlag = FLAG_NONE,int interpolatedFlag = FLAG_NONE);
 
 		////////////////
 		// Destructor //
@@ -160,7 +160,7 @@
 		* @param lifeTimeMin : the minimum life time
 		* @param lifeTimeMax : the maximum life time
 		*/
-		inline void setLifeTime(float lifeTimeMin,float lifeTimeMax);
+		void setLifeTime(float lifeTimeMin,float lifeTimeMax);
 
 		/**
 		* @brief Defines whether to generate immortal particles or not
@@ -171,7 +171,7 @@
 		*
 		* @param immortal : whether the Model will generate immortal particles or not
 		*/
-		inline void setImmortal(bool immortal);
+		void setImmortal(bool immortal);
 
 		/**
 		* @brief Sets a given parameter with 4 values
@@ -227,40 +227,40 @@
 		* @brief Gets the minimum life time
 		* @return the minimum life time
 		*/
-		inline float getLifeTimeMin() const;
+		float getLifeTimeMin() const;
 
 		/**
 		* @brief Gets the maximum life time
 		* @return the minimum life time
 		*/
-		inline float getLifeTimeMax() const;
+		float getLifeTimeMax() const;
 
 		/**
 		* @brief Returns whether immortility is set or not
 		* @return whether immortility is set or not
 		*/
-		inline bool isImmortal() const;
+		bool isImmortal() const;
 
 		/**
 		* @brief Checks whether a parameter is enabled or not
 		* @param type : the parameter
 		* @return 0 is the parameter is not enabled, a flag with the parameter bit set otherwise
 		*/
-		inline int isEnabled(ModelParam type) const;
+		int isEnabled(ModelParam type) const;
 
 		/**
 		* @brief Checks whether a parameter is mutable or not
 		* @param type : the parameter
 		* @return 0 is the parameter is not mutable, a flag with the parameter bit set otherwise
 		*/
-		inline int isMutable(ModelParam type) const;
+		int isMutable(ModelParam type) const;
 
 		/**
 		* @brief Checks whether a parameter is random or not
 		* @param type : the parameter
 		* @return 0 is the parameter is not random, a flag with the parameter bit set otherwise
 		*/
-		inline int isRandom(ModelParam type) const;
+		int isRandom(ModelParam type) const;
 
 		/**
 		* @brief Checks whether a parameter is interpolated or not
@@ -268,7 +268,7 @@
 		* @return 0 is the parameter is not interpolated, a flag with the parameter bit set otherwise
 		* @since 1.05.00
 		*/
-		inline int isInterpolated(ModelParam type) const;
+		int isInterpolated(ModelParam type) const;
 
 		/**
 		* @brief Gets a parameter value
@@ -333,14 +333,14 @@
 		* @return the number of enabled parameters in the model
 		* @since 1.05.00
 		*/
-		inline size_t getNbEnabled() const;
+		size_t getNbEnabled() const;
 
 		/**
 		* @brief Gets the number of mutable parameters
 		* @return the number of mutable parameters in the model
 		* @since 1.05.00
 		*/
-		inline size_t getNbMutable() const;
+		size_t getNbMutable() const;
 
 
 		/**
@@ -348,7 +348,7 @@
 		* @return the number of random parameters in the model
 		* @since 1.05.00
 		*/
-		inline size_t getNRandom() const;
+		size_t getNRandom() const;
 
 		/**
 		* @brief Gets the interpolator for the given parameter
@@ -356,14 +356,14 @@
 		* @return a pointer to the interpolator of the given parameter or NULL if the parameter is not interpolated
 		* @since 1.05.00
 		*/
-		inline Interpolator* getInterpolator(ModelParam param);
+		Interpolator* getInterpolator(ModelParam param);
 
 		/**
 		* @brief Gets the number of interpolated parameters
 		* @return the number of interpolated parameters in the model
 		* @since 1.05.00
 		*/
-		inline size_t getNbInterpolated() const;
+		size_t getNbInterpolated() const;
 
 		/**
 		* @brief Gets the number of float values in the particle current array
@@ -374,7 +374,7 @@
 		* @return the number of float values in the particle current array
 		* @since 1.02.00
 		*/
-		inline size_t getSizeOfParticleCurrentArray() const;
+		size_t getSizeOfParticleCurrentArray() const;
 
 		/**
 		* @brief Gets the number of float values in the particle extended array
@@ -385,7 +385,7 @@
 		* @return the number of float values in the particle extended array
 		* @since 1.03.00
 		*/
-		inline size_t getSizeOfParticleExtendedArray() const;
+		size_t getSizeOfParticleExtendedArray() const;
 
 		/**
 		* @brief Gets the number of float values in the model array
@@ -395,7 +395,7 @@
 		* @return the number of float values in the model array
 		* @since 1.02.00
 		*/
-		inline size_t getSizeOfModelArray() const;
+		size_t getSizeOfModelArray() const;
 
 		/**
 		* @brief Gets the offset of the given parameter in the current array
@@ -406,7 +406,7 @@
 		* @return the offset of the given parameter in the current array
 		* @since 1.03.00
 		*/
-		inline size_t getParameterOffset(ModelParam param) const;
+		size_t getParameterOffset(ModelParam param) const;
 
 		/**
 		* @brief Gets the default value of the parameter
@@ -563,7 +563,7 @@
 
 	inline size_t Model::getParameterOffset(ModelParam param) const
 	{
-		return particleEnableIndices[param];
+		return static_cast<size_t>(particleEnableIndices[param]);
 	}
 }
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Modifier.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Modifier.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Modifier.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Modifier.h	2013-05-01 13:12:52.000000000 +0000
@@ -90,7 +90,7 @@
 		////////////////
 
 		/** @brief Destructor of Modifier */
-		virtual inline ~Modifier() {}
+		virtual ~Modifier() {}
 
 		/////////////
 		// Setters //
@@ -105,7 +105,7 @@
 		* @param active : true to activate this Modifier, false to deactivate it
 		* @since 1.03.00
 		*/
-		inline void setActive(bool active);
+		void setActive(bool active);
 
 		/**
 		* @brief Sets the Zone of this Modifier
@@ -136,7 +136,7 @@
 		* @param local : true to consider the modifier local, false not to
 		* @since 1.03.02
 		*/
-		inline void setLocalToSystem(bool local);
+		void setLocalToSystem(bool local);
 
 		/////////////
 		// Getters //
@@ -147,31 +147,31 @@
 		* @return true if this Modifier is active, false if is is inactive
 		* @since 1.03.00
 		*/
-		inline bool isActive() const;
+		bool isActive() const;
 
 		/**
 		* @brief Gets the Zone of this Modifier
 		* @return the Zone of this Modifier
 		*/
-		inline Zone* getZone() const;
+		Zone* getZone() const;
 
 		/**
 		* @brief Gets the trigger of this Modifier
 		* @return the trigger of this Modifier
 		*/
-		inline ModifierTrigger getTrigger() const;
+		ModifierTrigger getTrigger() const;
 
 		/**
 		* @brief Gets a flag containing all the available triggers for this Modifier
 		* @return a flag containing all the available triggers for this Modifier
 		*/
-		inline int getAvailableTriggers() const;
+		int getAvailableTriggers() const;
 
 		/**
 		* @brief Tells whether the Zone of this Modifier is considerered to be full or not
 		* @return true if the Zone of this Modifier is considerered to be full, false if not
 		*/
-		inline bool isFullZone() const;
+		bool isFullZone() const;
 
 		/**
 		* @brief Tells whether this modifier is considered as being local to a system or not
@@ -181,7 +181,7 @@
 		* @return true if it is local, false if not
 		* @since 1.03.02
 		*/
-		inline bool isLocalToSystem() const;
+		bool isLocalToSystem() const;
 
 		///////////////
 		// Interface //
@@ -210,10 +210,10 @@
 		const int availableTriggers;
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const Modifier& modifier,bool createBase);
+		virtual void copyChildren(const Registerable& object,bool createBase);
 		virtual void destroyChildren(bool keepChildren);
 
-		virtual inline void propagateUpdateTransform();
+		virtual void propagateUpdateTransform();
 
 	private :
 
@@ -226,8 +226,8 @@
 		bool local;
 
 		void beginProcess(Group& group);
-		inline void endProcess(Group& group);
-		inline void process(Particle& particle,float deltaTime) const;
+		void endProcess(Group& group);
+		void process(Particle& particle,float deltaTime) const;
 
 		//////////////////////////
 		// Pure virtual methods //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Particle.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Particle.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Particle.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Particle.h	2013-05-01 13:12:52.000000000 +0000
@@ -31,6 +31,8 @@
 
 namespace SPK
 {
+	class Group;
+
 	/**
 	* @class Particle
 	* @brief A single particle (a point in space with a velocity and different parameters)
@@ -44,7 +46,7 @@
 	*/
 	class SPK_PREFIX Particle
 	{
-	friend inline bool isFurtherToCamera(const Particle&,const Particle&);
+	friend bool isFurtherToCamera(const Particle&,const Particle&);
 	friend void swapParticles(Particle& a,Particle& b);
 	friend class Group;
 	friend class Pool<Particle>;
@@ -110,7 +112,7 @@
 		*
 		* @param life : the amount of life left of the Particle
 		*/
-		inline void setLifeLeft(float life);
+		void setLifeLeft(float life);
 
 
 		/////////////
@@ -122,21 +124,21 @@
 		* @return the position of this Particle
 		* @since 1.02.00
 		*/
-		inline Vector3D& position();
+		Vector3D& position();
 
 		/**
 		* @brief Gets the velocity of the Particle
 		* @return the velocity of this Particle
 		* @since 1.02.00
 		*/
-		inline Vector3D& velocity();
+		Vector3D& velocity();
 
 		/**
 		* @brief Gets the old position of the Particle
 		* @return the old position of this Particle
 		* @since 1.02.00
 		*/
-		inline Vector3D& oldPosition();
+		Vector3D& oldPosition();
 
 		/**
 		* @brief Gets the position of the Particle
@@ -146,7 +148,7 @@
 		* @return the position of this Particle
 		* @since 1.02.00
 		*/
-		inline const Vector3D& position() const;
+		const Vector3D& position() const;
 
 		/**
 		* @brief Gets the velocity of the Particle
@@ -156,7 +158,7 @@
 		* @return the velocity of this Particle
 		* @since 1.02.00
 		*/
-		inline const Vector3D& velocity() const;
+		const Vector3D& velocity() const;
 
 		/**
 		* @brief Gets the old position of the Particle
@@ -166,7 +168,7 @@
 		* @return the old position of this Particle
 		* @since 1.02.00
 		*/
-		inline const Vector3D& oldPosition() const;
+		const Vector3D& oldPosition() const;
 
 		/**
 		* @brief Gets the current value for the given parameter
@@ -200,14 +202,14 @@
 		* @return A pointer on the Group of this Particle
 		* @since 1.02.00
 		*/
-		inline Group* getGroup() const;
+		Group* getGroup() const;
 
 		/**
 		* @brief Gets the index of this Particle in its Group
 		* @return the index of thi Particle in its Group
 		* @since 1.03.00
 		*/
-		inline size_t getIndex() const;
+		size_t getIndex() const;
 
 		/**
 		* @brief Gets the amount of life left of the Particle
@@ -217,7 +219,7 @@
 		*
 		* @return the amount of life left
 		*/
-		inline float getLifeLeft() const;
+		float getLifeLeft() const;
 
 		/**
 		* @brief Gets the age of the Particle
@@ -228,7 +230,7 @@
 		* @return the age of the particle
 		* @since 1.03.00
 		*/
-		inline float getAge() const;
+		float getAge() const;
 
 		/**
 		* @brief Gets the distance of this Particle from the camera.
@@ -238,7 +240,7 @@
 		* @return the distance of this Particle from the camera
 		* @since 1.01.00
 		*/
-		inline float getDistanceFromCamera() const;
+		float getDistanceFromCamera() const;
 
 		/**
 		* @brief Gets the square distance of this Particle from the camera.
@@ -249,7 +251,7 @@
 		* @return the square distance of this Particle from the camera
 		* @since 1.01.00
 		*/
-		inline float getSqrDistanceFromCamera() const;
+		float getSqrDistanceFromCamera() const;
 
 		/**
 		* @brief Tells whether this Particle was initialized at its latest update or not
@@ -259,7 +261,7 @@
 		* @return true if this Particle was initialized at its latest update, false if not
 		* @since 1.03.00
 		*/
-		inline bool isNewBorn() const;
+		bool isNewBorn() const;
 
 		/**
 		* @brief Tells whether this Particle is alive or not
@@ -269,7 +271,7 @@
 		* @return true if this Particle is alive, false if it is dead
 		* @since 1.04.00
 		*/
-		inline bool isAlive() const;
+		bool isAlive() const;
 
 		///////////////
 		// Interface //
@@ -289,12 +291,12 @@
 		*
 		* @since 1.01.00
 		*/
-		inline void kill();
+		void kill();
 
 		// As we know the color component are always enabled, we optimizes it a bit for access
-		inline float getR() const { return currentParams[PARAM_RED]; }
-		inline float getG() const { return currentParams[PARAM_GREEN]; }
-		inline float getB() const { return currentParams[PARAM_BLUE]; }
+		float getR() const { return currentParams[PARAM_RED]; }
+		float getG() const { return currentParams[PARAM_GREEN]; }
+		float getB() const { return currentParams[PARAM_BLUE]; }
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Pool.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Pool.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Pool.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Pool.h	2013-05-01 13:12:52.000000000 +0000
@@ -124,7 +124,7 @@
 		* @return the number of active elements in this Pool
 		* @since 1.01.01
 		*/
-		inline size_t size() const;
+		size_t size() const;
 
 		/**
 		* @brief Gets the number of active elements in this Pool
@@ -133,13 +133,13 @@
 		*
 		* @return the number of active elements in this Pool
 		*/
-		inline size_t getNbActive() const;
+		size_t getNbActive() const;
 
 		/**
 		* @brief Gets the number of inactive elements in this Pool
 		* @return the number of inactive elements in this Pool
 		*/
-		inline size_t getNbInactive() const;
+		size_t getNbInactive() const;
 
 		/**
 		* @brief Gets the number of elements in this Pool
@@ -148,7 +148,7 @@
 		*
 		* @return the number of elements in this Pool
 		*/
-		inline size_t getNbTotal() const;
+		size_t getNbTotal() const;
 
 		/**
 		* @brief Gets the capacity of this Pool
@@ -157,7 +157,7 @@
 		*
 		* @return the capacity of this Pool
 		*/
-		inline size_t getNbReserved() const;
+		size_t getNbReserved() const;
 
 		/**
 		* @brief Gets the room left for new elements in this Pool
@@ -166,7 +166,7 @@
 		*
 		* @return the room left in this Pool
 		*/
-		inline size_t getNbEmpty() const;
+		size_t getNbEmpty() const;
 
 		/**
 		* @brief Gets the maximum number of elements this Pool had
@@ -175,7 +175,7 @@
 		*
 		* @return the maximum number of elements this Pool had
 		*/
-		inline size_t getMaxTotal() const;
+		size_t getMaxTotal() const;
 
 		///////////////
 		// Iterators //
@@ -188,7 +188,7 @@
 		*
 		* @return an iterator referring to the first active element in this Pool
 		*/
-		inline iterator begin();
+		iterator begin();
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end active element in this Pool
@@ -198,7 +198,7 @@
 		*
 		* @return an iterator referring to the past-the-end active element in this Pool
 		*/
-		inline iterator end();
+		iterator end();
 
 		/**
 		* @brief Gets an iterator referring to the first active element in this Pool
@@ -207,7 +207,7 @@
 		*
 		* @return an iterator referring to the first active element in this Pool
 		*/
-		inline iterator beginActive();
+		iterator beginActive();
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end active element in this Pool
@@ -217,7 +217,7 @@
 		*
 		* @return an iterator referring to the past-the-end active element in this Pool
 		*/
-		inline iterator endActive();
+		iterator endActive();
 
 		/**
 		* @brief Gets an iterator referring to the first inactive element in this Pool
@@ -226,13 +226,13 @@
 		*
 		* @return an iterator referring to the first inactive element in this Pool
 		*/
-		inline iterator beginInactive();
+		iterator beginInactive();
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end inactive element in this Pool
 		* @return an iterator referring to the past-the-end inactive element in this Pool
 		*/
-		inline iterator endInactive();
+		iterator endInactive();
 
 		/**
 		* @brief Gets an iterator referring to the first active element in this Pool
@@ -241,7 +241,7 @@
 		*
 		* @return an iterator referring to the first active element in this Pool
 		*/
-		inline const_iterator begin() const;
+		const_iterator begin() const;
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end active element in this Pool
@@ -250,7 +250,7 @@
 		*
 		* @return an iterator referring to the past-the-end active element in this Pool
 		*/
-		inline const_iterator end() const;
+		const_iterator end() const;
 
 		/**
 		* @brief Gets an iterator referring to the first active element in this Pool
@@ -259,7 +259,7 @@
 		*
 		* @return an iterator referring to the first active element in this Pool
 		*/
-		inline const_iterator beginActive() const;
+		const_iterator beginActive() const;
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end active element in this Pool
@@ -268,7 +268,7 @@
 		*
 		* @return an iterator referring to the past-the-end active element in this Pool
 		*/
-		inline const_iterator endActive() const;
+		const_iterator endActive() const;
 
 		/**
 		* @brief Gets an iterator referring to the first inactive element in this Pool
@@ -277,7 +277,7 @@
 		*
 		* @return an iterator referring to the first inactive element in this Pool
 		*/
-		inline const_iterator beginInactive() const;
+		const_iterator beginInactive() const;
 
 		/**
 		* @brief Gets an iterator referring to the past-the-end inactive element in this Pool
@@ -286,7 +286,7 @@
 		*
 		* @return an iterator referring to the past-the-end inactive element in this Pool
 		*/
-		inline const_iterator endInactive() const;
+		const_iterator endInactive() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the first active element in this Pool
@@ -295,7 +295,7 @@
 		*
 		* @return a reverse iterator referring to the first active element in this Pool
 		*/
-		inline reverse_iterator rbegin();
+		reverse_iterator rbegin();
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end active element in this Pool
@@ -305,7 +305,7 @@
 		*
 		* @return a reverse iterator referring to the past-the-end active element in this Pool
 		*/
-		inline reverse_iterator rend();
+		reverse_iterator rend();
 
 		/**
 		* @brief Gets a reverse iterator referring to the first active element in this Pool
@@ -314,7 +314,7 @@
 		*
 		* @return a reverse iterator referring to the first active element in this Pool
 		*/
-		inline reverse_iterator rbeginActive();
+		reverse_iterator rbeginActive();
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end active element in this Pool
@@ -324,7 +324,7 @@
 		*
 		* @return a reverse iterator referring to the past-the-end active element in this Pool
 		*/
-		inline reverse_iterator rendActive();
+		reverse_iterator rendActive();
 
 		/**
 		* @brief Gets a reverse iterator referring to the first inactive element in this Pool
@@ -333,13 +333,13 @@
 		*
 		* @return a reverse iterator referring to the first inactive element in this Pool
 		*/
-		inline reverse_iterator rbeginInactive();
+		reverse_iterator rbeginInactive();
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end inactive element in this Pool
 		* @return a reverse iterator referring to the past-the-end inactive element in this Pool
 		*/
-		inline reverse_iterator rendInactive();
+		reverse_iterator rendInactive();
 
 		/**
 		* @brief Gets a reverse iterator referring to the first active element in this Pool
@@ -348,7 +348,7 @@
 		*
 		* @return a reverse iterator referring to the first active element in this Pool
 		*/
-		inline const_reverse_iterator rbegin() const;
+		const_reverse_iterator rbegin() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end active element in this Pool
@@ -357,7 +357,7 @@
 		*
 		* @return a reverse iterator referring to the past-the-end active element in this Pool
 		*/
-		inline const_reverse_iterator rend() const;
+		const_reverse_iterator rend() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the first active element in this Pool
@@ -366,7 +366,7 @@
 		*
 		* @return a reverse iterator referring to the first active element in this Pool
 		*/
-		inline const_reverse_iterator rbeginActive() const;
+		const_reverse_iterator rbeginActive() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end active element in this Pool
@@ -375,7 +375,7 @@
 		*
 		* @return a reverse iterator referring to the past-the-end active element in this Pool
 		*/
-		inline const_reverse_iterator rendActive() const;
+		const_reverse_iterator rendActive() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the first inactive element in this Pool
@@ -384,7 +384,7 @@
 		*
 		* @return a reverse iterator referring to the first inactive element in this Pool
 		*/
-		inline const_reverse_iterator rbeginInactive() const;
+		const_reverse_iterator rbeginInactive() const;
 
 		/**
 		* @brief Gets a reverse iterator referring to the past-the-end inactive element in this Pool
@@ -393,7 +393,7 @@
 		*
 		* @return a reverse iterator referring to the past-the-end inactive element in this Pool
 		*/
-		inline const_reverse_iterator rendInactive() const;
+		const_reverse_iterator rendInactive() const;
 
 		/////////////////////
 		// Elements access //
@@ -407,7 +407,7 @@
 		* @return the first active element
 		* @since 1.01.01
 		*/
-		inline T& front();
+		T& front();
 
 		/**
 		* @brief Gets the last active element
@@ -417,7 +417,7 @@
 		* @return the last active element
 		* @since 1.01.01
 		*/
-		inline T& back();
+		T& back();
 
 		/**
 		* @brief Gets the first active element
@@ -427,7 +427,7 @@
 		* @return the first active element
 		* @since 1.01.01
 		*/
-		inline T& frontActive();
+		T& frontActive();
 
 		/**
 		* @brief Gets the last active element
@@ -437,21 +437,21 @@
 		* @return the last active element
 		* @since 1.01.01
 		*/
-		inline T& backActive();
+		T& backActive();
 
 		/**
 		* @brief Gets the first inactive element
 		* @return the first inactive element
 		* @since 1.01.01
 		*/
-		inline T& frontInactive();
+		T& frontInactive();
 
 		/**
 		* @brief Gets the last inactive element
 		* @return the last inactive element
 		* @since 1.01.01
 		*/
-		inline T& backInactive();
+		T& backInactive();
 
 		/**
 		* @brief Gets the first active element
@@ -461,7 +461,7 @@
 		* @return the first active element
 		* @since 1.01.01
 		*/
-		inline const T& front() const;
+		const T& front() const;
 
 		/**
 		* @brief Gets the last active element
@@ -471,7 +471,7 @@
 		* @return the last active element
 		* @since 1.01.01
 		*/
-		inline const T& back() const;
+		const T& back() const;
 
 		/**
 		* @brief Gets the first active element
@@ -481,7 +481,7 @@
 		* @return the first active element
 		* @since 1.01.01
 		*/
-		inline const T& frontActive() const;
+		const T& frontActive() const;
 
 		/**
 		* @brief Gets the last active element
@@ -491,7 +491,7 @@
 		* @return the last active element
 		* @since 1.01.01
 		*/
-		inline const T& backActive() const;
+		const T& backActive() const;
 
 		/**
 		* @brief Gets the first inactive element
@@ -501,7 +501,7 @@
 		* @return the first inactive element
 		* @since 1.01.01
 		*/
-		inline const T& frontInactive() const;
+		const T& frontInactive() const;
 
 		/**
 		* @brief Gets the last inactive element
@@ -511,7 +511,7 @@
 		* @return the last inactive element
 		* @since 1.01.01
 		*/
-		inline const T& backInactive() const;
+		const T& backInactive() const;
 		
 
 		///////////////
@@ -526,7 +526,7 @@
 		*
 		* @param value : the element which will be copied into the Pool
 		*/
-		inline void assign(T& value);
+		void assign(T& value);
 
 		/**
 		* @brief Adds an active element to this Pool
@@ -552,7 +552,7 @@
 		void makeInactive(size_t index);
 
 		/** @brief Inactivates all the elements */
-		inline void makeAllInactive();
+		void makeAllInactive();
 
 		/**
 		* @brief Activates the first inactive element
@@ -599,7 +599,7 @@
 		*
 		* @param capacity : the new desired capacity for this Pool
 		*/
-		inline void reallocate(size_t capacity);
+		void reallocate(size_t capacity);
 
 	private :
 
@@ -608,7 +608,7 @@
 		size_t nbActive;
 		size_t maxTotal;
 
-		inline void swapElements(T& a,T& b);
+		void swapElements(T& a,T& b);
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_RegWrapper.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_RegWrapper.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_RegWrapper.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_RegWrapper.h	2013-05-01 13:12:52.000000000 +0000
@@ -65,7 +65,7 @@
 		* @return A new registered RegWrapper
 		* @since 1.04.00
 		*/
-		static inline RegWrapper<T>* create(const T& object = T());
+		static RegWrapper<T>* create(const T& object = T());
 		
 		/////////////
 		// Getters //
@@ -75,13 +75,13 @@
 		* @brief Gets a reference on the inner object
 		* @return a reference on the inner object
 		*/
-		inline T& get();
+		T& get();
 
 		/**
 		* @brief Gets a constant reference on the inner object
 		* @return a constant reference on the inner object
 		*/
-		inline const T& get() const;
+		const T& get() const;
 		
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Registerable.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Registerable.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Registerable.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Registerable.h	2013-05-01 13:12:52.000000000 +0000
@@ -120,7 +120,7 @@
 		*
 		* @param shared : true to make this Registerable shared, false to make it unshared
 		*/
-		inline void setShared(bool shared);
+		void setShared(bool shared);
 
 		/**
 		* @brief Makes this Registerable destroyable or not
@@ -129,7 +129,7 @@
 		*
 		* @param destroyable : true to make this Registerable destroyable, false to make it undestroyable
 		*/
-		inline void setDestroyable(bool destroyable);
+		void setDestroyable(bool destroyable);
 
 		/**
 		* @brief Sets the name of this Registerable
@@ -142,7 +142,7 @@
 		* @param name : the name of this registerable
 		* @since 1.05.00
 		*/
-		inline void setName(const std::string& name);
+		void setName(const std::string& name);
 
 		/////////////
 		// Getters //
@@ -157,14 +157,14 @@
 		* @return the ID of this Registerable or NO_ID if it is not registered
 		* @since 1.05.04
 		*/
-		inline SPK_ID getSPKID() const;
+		SPK_ID getSPKID() const;
 
 		/**
 		* @brief Gets the ID of this Registerable
 		* @return the ID of this Registerable or NO_ID if it is not registered
 		* @deprecated 1.05.04 Use getSPKID instead
 		*/
-		inline SPK_ID getID() const;
+		SPK_ID getID() const;
 
 		/**
 		* @brief Gets the number of references of this Registerable
@@ -176,25 +176,25 @@
 		*
 		* @return the number of references of this Registerable
 		*/
-		inline unsigned int getNbReferences() const;
+		unsigned int getNbReferences() const;
 		
 		/**
 		* @brief Tells whether this Registerable is registered or not
 		* @return true if this Registerable is registered, false if not
 		*/
-		inline bool isRegistered() const;
+		bool isRegistered() const;
 
 		/**
 		* @brief Tells whether this Registerable is shared or not
 		* @return true if this Registerable is shared, false if not
 		*/
-		inline bool isShared() const;
+		bool isShared() const;
 
 		/**
 		* @brief Tells whether this Registerable is destroyable or not
 		* @return true if this Registerable is destroyable, false if not
 		*/
-		inline bool isDestroyable() const;
+		bool isDestroyable() const;
 
 		/**
 		* @brief Gets the name of this registerable
@@ -205,7 +205,7 @@
 		* @return the name of this registerable
 		* @since 1.05.00
 		*/
-		inline const std::string& getName() const;
+		const std::string& getName() const;
 
 		/**
 		* @brief Gets the name of the class of the object
@@ -232,7 +232,7 @@
 		* @return : the first registerable with that name within this registerable or NULL if none is found
 		* @since 1.05.00
 		*/
-		inline virtual Registerable* findByName(const std::string& name);
+		virtual Registerable* findByName(const std::string& name);
 
 	protected :
 
@@ -280,7 +280,7 @@
 		*
 		* @param child : the child of this Registerable to increment references of
 		*/
-		inline void incrementChildReference(Registerable* child);
+		void incrementChildReference(Registerable* child);
 
 		/**
 		* @brief Decrements the number of references of the child by one
@@ -290,7 +290,7 @@
 		*
 		* @param child : the child of this Registerable to decrement references of
 		*/
-		inline void decrementChildReference(Registerable* child);
+		void decrementChildReference(Registerable* child);
 
 		/**
 		* @brief Registers a Registerable in the factory
@@ -360,11 +360,11 @@
 		bool destroyable;
 
 		// Those methods allow specific behavior when registering and unregistering in the SPKFactory
-		virtual inline void onRegister() {}		// Called when a registerable is registered in the SPKFactory
-		virtual inline void onUnregister() {}	// Called when a registerable is unregistered from the SPKFactory
+		virtual void onRegister() {}		// Called when a registerable is registered in the SPKFactory
+		virtual void onUnregister() {}	// Called when a registerable is unregistered from the SPKFactory
 
-		inline void incrementReference();
-		inline void decrementReference();
+		void incrementReference();
+		void decrementReference();
 
 		// the assignment operator is private
 		Registerable& operator=(const Registerable& registerable);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Renderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Renderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Renderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Renderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -105,7 +105,7 @@
 		* @param active : true to activate this Renderer, false to deactivate it
 		* @since 1.03.00
 		*/
-		inline void setActive(bool active);
+		void setActive(bool active);
 
 		/**
 		* @brief Sets the blending mode of this renderer
@@ -127,7 +127,7 @@
 		* @param enable : true to enable it, false to disable it
 		* @since 1.04.00
 		*/
-		virtual inline void enableRenderingHint(RenderingHint renderingHint,bool enable);
+		virtual void enableRenderingHint(RenderingHint renderingHint,bool enable);
 
 		/**
 		* @brief Tells the alpha threshold to use when the ALPHA_TEST is enabled
@@ -137,7 +137,7 @@
 		* @param alphaThreshold : the alpha threshold to use for the alpha test
 		* @since 1.04.00
 		*/
-		virtual inline void setAlphaTestThreshold(float alphaThreshold);
+		virtual void setAlphaTestThreshold(float alphaThreshold);
 
 		/////////////
 		// Getters //
@@ -148,21 +148,21 @@
 		* @return true if this Renderer is active, false if is is inactive
 		* @since 1.03.00
 		*/
-		inline bool isActive() const;
+		bool isActive() const;
 
 		/**
 		* @brief Tells whether a rendering hint is enabled or not
 		* @param renderingHint : the rendering hint
 		* @since 1.04.00
 		*/
-		virtual inline bool isRenderingHintEnabled(RenderingHint renderingHint) const;
+		virtual bool isRenderingHintEnabled(RenderingHint renderingHint) const;
 
 		/**
 		* @brief Gets the alpha threhold used by the alpha test
 		* @return the alpha threhold used by the alpha test
 		* @since 1.04.00
 		*/
-		inline float getAlphaTestThreshold() const;
+		float getAlphaTestThreshold() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_System.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_System.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_System.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_System.h	2013-05-01 13:12:52.000000000 +0000
@@ -78,7 +78,7 @@
 		* @return A new registered System
 		* @since 1.04.00
 		*/
-		static inline System* create();
+		static System* create();
 
 		////////////////
 		// Destructor //
@@ -170,7 +170,7 @@
 		*
 		* @param AABB : true to enable the computing of the AABB of this System, false to disable it
 		*/
-		inline void enableAABBComputing(bool AABB);
+		void enableAABBComputing(bool AABB);
 
 		/////////////
 		// Getters //
@@ -201,7 +201,7 @@
 		*
 		* @return the number of active particle in the system
 		*/
-		inline size_t getNbParticles() const;
+		size_t getNbParticles() const;
 
 		/**
 		* @brief Computes the number of active particles in this System and returns it
@@ -222,7 +222,7 @@
 		* @brief Gets the number of groups in the System
 		* @return the number of groups in the System
 		*/
-		inline size_t getNbGroups() const;
+		size_t getNbGroups() const;
 
 		/**
 		* @brief Gets the vector of the groups (pointers) in this System
@@ -232,7 +232,7 @@
 		*
 		* @return a STL vector containing the groups in the System
 		*/
-		inline const std::vector<Group*>& getGroups() const;
+		const std::vector<Group*>& getGroups() const;
 
 		/**
 		* @brief Gets the Group at index
@@ -243,7 +243,7 @@
 		* @return the Group at index
 		* @since 1.03.00
 		*/
-		inline Group* getGroup(size_t index);
+		Group* getGroup(size_t index);
 
 		/**
 		* @brief Tells whether the computation of the axis aligned bouding box is enabled
@@ -252,7 +252,7 @@
 		*
 		* @return true if the computation of the AABB is enabled, false if it is disabled
 		*/
-		inline bool isAABBComputingEnabled() const;
+		bool isAABBComputingEnabled() const;
 
 		/**
 		* @brief Gets a Vector3D holding the minimum coordinates of the AABB of this System.
@@ -262,7 +262,7 @@
 		* @return a Vector3D holding the minimum coordinates of the AABB of this System
 		* @since 1.01.00
 		*/
-		inline const Vector3D& getAABBMin() const;
+		const Vector3D& getAABBMin() const;
 
 		/**
 		* @brief Gets a Vector3D holding the maximum coordinates of the AABB of this System.
@@ -272,7 +272,7 @@
 		* @return a Vector3D holding the maximum coordinates of the AABB of this System
 		* @since 1.01.00
 		*/
-		inline const Vector3D& getAABBMax() const;
+		const Vector3D& getAABBMax() const;
 
 		///////////////
 		// Interface //
@@ -377,7 +377,7 @@
 		std::vector<Group*> groups;
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const System& system,bool keepChildren);
+		virtual void copyChildren(const Registerable& object,bool keepChildren);
 		virtual void destroyChildren(bool createBase);
 
 		virtual void propagateUpdateTransform();
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Transformable.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Transformable.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Transformable.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Transformable.h	2013-05-01 13:12:52.000000000 +0000
@@ -81,7 +81,7 @@
 		////////////////
 
 		/** @brief Destructor of Transformable */
-		virtual inline ~Transformable() {}
+		virtual ~Transformable() {}
 
 		/////////////
 		// Setters //
@@ -100,7 +100,7 @@
 		*
 		* @param transform : the transform to copy its content from
 		*/
-		inline void setTransform(const float* transform);
+		void setTransform(const float* transform);
 
 		/**
 		* @brief Sets the local transfom of this Transformable from a "non contiguous vector coordinates" matrix
@@ -222,89 +222,89 @@
 		* @brief Gets the local transform of this Transformable
 		* @return a pointer to the local transform of this Transformable
 		*/
-		inline const float* getLocalTransform() const;
+		const float* getLocalTransform() const;
 
 		/**
 		* @brief Gets the world transform of this Transformable
 		* @return a pointer to the world transform of this Transformable
 		*/
-		inline const float* getWorldTransform() const;
+		const float* getWorldTransform() const;
 
 		/**
 		* @brief Tells whether the local transform is the identity or not
 		* @return true if the local transform is identity, false if not
 		*/
-		inline bool isLocalIdentity() const;
+		bool isLocalIdentity() const;
 
 		/**
 		* @brief Gets the position of the local transform
 		* @return the position of the local transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getLocalTransformPos() const;
+		Vector3D getLocalTransformPos() const;
 
 		/**
 		* @brief Gets the side vector of the local transform
 		* @return the side vector of the local transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getLocalTransformSide() const;
+		Vector3D getLocalTransformSide() const;
 
 		/**
 		* @brief Gets the up vector of the local transform
 		* @return the up vector of the local transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getLocalTransformUp() const;
+		Vector3D getLocalTransformUp() const;
 
 		/**
 		* @brief Gets the look vector of the local transform in a right-handed system
 		* @return the look vector of the local transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getLocalTransformLookRH() const;
+		Vector3D getLocalTransformLookRH() const;
 
 		/**
 		* @brief Gets the look vector of the local transform in a left-handed system
 		* @return the look vector of the local transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getLocalTransformLookLH() const;
+		Vector3D getLocalTransformLookLH() const;
 
 		/**
 		* @brief Gets the position of the world transform
 		* @return the position of the world transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getWorldTransformPos() const;
+		Vector3D getWorldTransformPos() const;
 
 		/**
 		* @brief Gets the side vector of the world transform
 		* @return the side vector of the world transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getWorldTransformSide() const;
+		Vector3D getWorldTransformSide() const;
 
 		/**
 		* @brief Gets the up vector of the world transform
 		* @return the up vector of the world transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getWorldTransformUp() const;
+		Vector3D getWorldTransformUp() const;
 
 		/**
 		* @brief Gets the look vector of the world transform  in a right-handed system
 		* @return the look vector of the world transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getWorldTransformLookRH() const;
+		Vector3D getWorldTransformLookRH() const;
 
 		/**
 		* @brief Gets the look vector of the world transform  in a left-handed system
 		* @return the look vector of the world transform
 		* @since 1.05.00
 		*/
-		inline Vector3D getWorldTransformLookLH() const;
+		Vector3D getWorldTransformLookLH() const;
 
 		///////////////
 		// Interface //
@@ -323,7 +323,7 @@
 		* @param pos : the position of the transformable
 		* @since 1.05.00
 		*/
-		inline void lookAtRH(const Vector3D& target,Vector3D up,const Vector3D& pos);
+		void lookAtRH(const Vector3D& target,Vector3D up,const Vector3D& pos);
 
 		/**
 		* @brief lookAt method for a left-handed system
@@ -338,7 +338,7 @@
 		* @param pos : the position of the transformable
 		* @since 1.05.00
 		*/
-		inline void lookAtLH(const Vector3D& target,Vector3D up,const Vector3D& pos);
+		void lookAtLH(const Vector3D& target,Vector3D up,const Vector3D& pos);
 
 		/**
 		* @brief Updates the world transform of this Transformable
@@ -353,7 +353,7 @@
 		void updateTransform(const Transformable* parent = NULL);
 
 		/** @brief Resets the transform to identity */
-		inline void resetTransform();
+		void resetTransform();
 
 	protected :
 
@@ -375,20 +375,20 @@
 		* @brief Tells whether this Transformable needs update or not
 		* @return true if it needs update, false if not
 		*/
-		inline bool isUpdateNotified() const;
+		bool isUpdateNotified() const;
 
 		/**
 		* @brief Notifies the Transformable for a update need
 		*
 		* This method has to be called when modifying a parameter that impose the transform's recomputation.
 		*/
-		inline void notifyForUpdate();
+		void notifyForUpdate();
 
 		/**
 		* @brief Gets the latest parent of this Transformable
 		* @return the latest parent of this Transformable or NULL
 		*/
-		inline const Transformable* getParentTransform() const;
+		const Transformable* getParentTransform() const;
 
 		/**
 		* @brief Updates all the parameters in the world coordinates
@@ -396,7 +396,7 @@
 		* This method can be overriden in derived classes of Transformable (By default it does nothing).<br>
 		* It is this method task to compute all parameters of the class that are dependent of the world transform.
 		*/
-		virtual inline void innerUpdateTransform() {}
+		virtual void innerUpdateTransform() {}
 
 		/**
 		* @brief Propagates the update of the transform to transformable children of this transformable
@@ -406,7 +406,7 @@
 		*
 		* @since 1.05.00
 		*/
-		virtual inline void propagateUpdateTransform() {}
+		virtual void propagateUpdateTransform() {}
 
 	private :
 
@@ -420,17 +420,17 @@
 
 		const Transformable* parent;
 
-		inline static void multiply(
+		static void multiply(
 			float* dest,
 			const float* src0,
 			const float* src1);
 
-		inline static void multiply(
+		static void multiply(
 			Vector3D& dest,
 			const Vector3D& v,
 			const float* m);
 
-		inline static void rotate(
+		static void rotate(
 			Vector3D& dest,
 			const Vector3D& v,
 			const float* m);
@@ -439,7 +439,7 @@
 
 	inline void Transformable::setTransform(const float* transform)
 	{
-		memcpy(local,transform,sizeof(float) * TRANSFORM_LENGTH);
+		std::memcpy(local,transform,sizeof(float) * TRANSFORM_LENGTH);
 		localIdentity = false;
 		notifyForUpdate();
 	}
@@ -542,7 +542,7 @@
 		return parent;
 	}
 
-	void Transformable::multiply(
+	inline void Transformable::multiply(
 		float* dest,
 		const float* src0,
 		const float* src1)
@@ -562,7 +562,7 @@
 		}
 	}
 
-	void Transformable::multiply(
+	inline void Transformable::multiply(
 		Vector3D& dest,
 		const Vector3D& v,
 		const float* m)
@@ -574,7 +574,7 @@
 		dest.z = v.x * m[2] + v.y * m[6] + v.z * m[10] + m[14];
 	}
 
-	void Transformable::rotate(
+	inline void Transformable::rotate(
 		Vector3D& dest,
 		const Vector3D& v,
 		const float* m)
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Vector3D.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Vector3D.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Vector3D.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Vector3D.h	2013-05-01 13:12:52.000000000 +0000
@@ -152,7 +152,7 @@
 		*
 		* return a Vector3D which is the reverse of this Vector3D
 		*/
-		inline Vector3D operator-() const;
+		Vector3D operator-() const;
 
 		/**
 		* @brief Accesses the Vector3D coordinates in an container like fashion
@@ -205,7 +205,7 @@
 		*
 		* @return the square norm of the Vector3D
 		*/
-		inline float getSqrNorm() const;
+		float getSqrNorm() const;
 
 		/**
 		* @brief Gets the norm of the Vector3D
@@ -214,7 +214,7 @@
 		*
 		* @return the norm of the Vector3D
 		*/
-		inline float getNorm() const;
+		float getNorm() const;
 
 		/**
 		* @brief Normalizes the Vector3D
@@ -274,7 +274,7 @@
 	* @param v1 : the second vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator+(const Vector3D& v0,const Vector3D& v1);
+	Vector3D operator+(const Vector3D& v0,const Vector3D& v1);
 
 	/**
 	* @brief Substracts two Vector3D
@@ -288,7 +288,7 @@
 	* @param v1 : the second vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator-(const Vector3D& v0,const Vector3D& v1);
+	Vector3D operator-(const Vector3D& v0,const Vector3D& v1);
 
 	/**
 	* @brief Adds a Vector3D and a float
@@ -302,7 +302,7 @@
 	* @param f : the floating number
 	* @return the result vector3D
 	*/
-	inline Vector3D operator+(const Vector3D& v,float f);
+	Vector3D operator+(const Vector3D& v,float f);
 
 	/**
 	* @brief Adds a float and a Vector3D
@@ -316,7 +316,7 @@
 	* @param v : the vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator+(float f,const Vector3D& v);
+	Vector3D operator+(float f,const Vector3D& v);
 
 	/**
 	* @brief Substracts a float to a Vector3D
@@ -330,7 +330,7 @@
 	* @param f : the floating number
 	* @return the result vector3D
 	*/
-	inline Vector3D operator-(const Vector3D& v,float f);
+	Vector3D operator-(const Vector3D& v,float f);
 
 	/**
 	* @brief Substracts a Vector3D to a float
@@ -344,7 +344,7 @@
 	* @param v : the vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator-(float f,const Vector3D& v);
+	Vector3D operator-(float f,const Vector3D& v);
 
 	/**
 	* @brief Multiplies a Vector3D by a float
@@ -358,7 +358,7 @@
 	* @param f : the floating number
 	* @return the result vector3D
 	*/
-	inline Vector3D operator*(const Vector3D& v,float f);
+	Vector3D operator*(const Vector3D& v,float f);
 
 	/**
 	* @brief Multiplies a float by a Vector3D
@@ -372,7 +372,7 @@
 	* @param v : the vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator*(float f,const Vector3D& v);
+	Vector3D operator*(float f,const Vector3D& v);
 
 	/**
 	* @brief Divides a Vector3D by a float
@@ -386,7 +386,7 @@
 	* @param f : the floating number
 	* @return the result vector3D
 	*/
-	inline Vector3D operator/(const Vector3D& v,float f);
+	Vector3D operator/(const Vector3D& v,float f);
 
 	/**
 	* @brief Divides a float by a Vector3D
@@ -400,7 +400,7 @@
 	* @param v : the vector3D
 	* @return the result vector3D
 	*/
-	inline Vector3D operator/(float f,const Vector3D& v);
+	Vector3D operator/(float f,const Vector3D& v);
 
 	/**
 	* @brief Tests whether 2 Vector3D are equal
@@ -409,7 +409,7 @@
 	* @return true if the Vector3D are equal, false if not
 	* @since 1.01.01
 	*/
-	inline bool operator==(const Vector3D& v0,const Vector3D& v1);
+	bool operator==(const Vector3D& v0,const Vector3D& v1);
 
 	/**
 	* @brief Tests whether 2 Vector3D are different
@@ -418,7 +418,7 @@
 	* @return true if the Vector3D are different, false if not
 	* @since 1.01.01
 	*/
-	inline bool operator!=(const Vector3D& v0,const Vector3D& v1);
+	bool operator!=(const Vector3D& v0,const Vector3D& v1);
 
 	/**
 	* @brief Writes a Vector3D on an output stream
@@ -430,7 +430,7 @@
 	* @return the output stream
 	* @since 1.01.01
 	*/
-	inline std::ostream& operator<<(std::ostream& s,const Vector3D& v);
+	std::ostream& operator<<(std::ostream& s,const Vector3D& v);
 
 	////////////////////////
 	// External functions //
@@ -461,7 +461,7 @@
 	* @param v1 : the second Vector3D
 	* @return the dot product (v0 . v1)
 	*/
-	inline float dotProduct(const Vector3D& v0,const Vector3D& v1);
+	float dotProduct(const Vector3D& v0,const Vector3D& v1);
 
 	/**
 	* @brief Returns the cross product between two Vector3D
@@ -487,7 +487,7 @@
 
 	inline float Vector3D::getNorm() const
 	{
-		return sqrt(getSqrNorm());
+		return std::sqrt(getSqrNorm());
 	}
 
 	inline Vector3D Vector3D::operator-() const
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Zone.h maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Zone.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Core/SPK_Zone.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Core/SPK_Zone.h	2013-05-01 13:12:52.000000000 +0000
@@ -62,7 +62,7 @@
 		////////////////
 
 		/** @brief Destructor of Zone */
-		virtual inline ~Zone() {}
+		virtual ~Zone() {}
 
 		////////////
 		// Setter //
@@ -72,7 +72,7 @@
 		* @brief Sets the position of this Zone
 		* @param v : the position of this Zone
 		*/
-		virtual inline void setPosition(const Vector3D& v);
+		virtual void setPosition(const Vector3D& v);
 
 		/////////////
 		// Getters //
@@ -82,14 +82,14 @@
 		* @brief Gets the position of this Zone
 		* @return the position of this Zone
 		*/
-		inline const Vector3D& getPosition() const;
+		const Vector3D& getPosition() const;
 
 		/**
 		* @brief Gets the transformed position of this Zone
 		* @return the transformed position of this Zone
 		* @since 1.03.00
 		*/
-		inline const Vector3D& getTransformedPosition() const;
+		const Vector3D& getTransformedPosition() const;
 
 		///////////////
 		// Interface //
@@ -152,9 +152,9 @@
 		* @param v : the Vector3D to normalize or randomize if not normalizable
 		* @since 1.03.00
 		*/
-		static inline void normalizeOrRandomize(Vector3D& v);
+		static void normalizeOrRandomize(Vector3D& v);
 
-		virtual inline void innerUpdateTransform();
+		virtual void innerUpdateTransform();
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_NormalEmitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_NormalEmitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_NormalEmitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_NormalEmitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -62,7 +62,7 @@
 		* @return A new registered NormalEmitter
 		* @since 1.04.00
 		*/
-		static inline NormalEmitter* create(Zone* normalZone = NULL,bool inverted = false);
+		static NormalEmitter* create(Zone* normalZone = NULL,bool inverted = false);
 		
 		/////////////
 		// Setters //
@@ -72,7 +72,7 @@
 		* @brief Sets whether normals are inverted or not
 		* @param inverted true to use inverted normals, false not to
 		*/
-		inline void setInverted(bool inverted);
+		void setInverted(bool inverted);
 
 		/**
 		* @brief the Zone used to compute normals
@@ -91,13 +91,13 @@
 		* @brief Tells whether normals are inverted for this NormalEmitter
 		* @return true if normals are inverted, false if not
 		*/
-		inline bool isInverted() const;
+		bool isInverted() const;
 		
 		/**
 		* @brief Gets the normal Zone of this NormalEmitter
 		* @return the normal Zone of this NormalEmitter
 		*/
-		inline Zone* getNormalZone() const;
+		Zone* getNormalZone() const;
 
 		///////////////
 		// Interface //
@@ -108,7 +108,7 @@
 	protected :
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const NormalEmitter& emitter,bool createBase);
+		virtual void copyChildren(const Registerable& object,bool createBase);
 		virtual void destroyChildren(bool keepChildren);
 
 	private :
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_RandomEmitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_RandomEmitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_RandomEmitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_RandomEmitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -44,7 +44,7 @@
 		* @return A new registered RandomEmitter
 		* @since 1.04.00
 		*/
-		static inline RandomEmitter* create();
+		static RandomEmitter* create();
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_SphericEmitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_SphericEmitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_SphericEmitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_SphericEmitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -72,7 +72,7 @@
 		* @param angleB : the second angle in radians of the SphericEmitter
 		* @since 1.04.00
 		*/
-		static inline SphericEmitter* create(const Vector3D& direction = Vector3D(0.0f,0.0f,-1.0f),float angleA = 0.0f,float angleB = 0.0f);
+		static SphericEmitter* create(const Vector3D& direction = Vector3D(0.0f,0.0f,-1.0f),float angleA = 0.0f,float angleB = 0.0f);
 
 		/////////////
 		// Setters //
@@ -107,25 +107,25 @@
 		* @brief Gets the direction of this SphericEmitter
 		* @return the direction of this SphericEmitter
 		*/
-		inline const Vector3D& getDirection() const;
+		const Vector3D& getDirection() const;
 
 		/**
 		* @brief Gets the direction of this SphericEmitter
 		* @return the direction of this SphericEmitter
 		*/
-		inline const Vector3D& getTransformedDirection() const;
+		const Vector3D& getTransformedDirection() const;
 
 		/**
 		* @brief Gets the minimum angle of this SphericEmitter
 		* @return the minimum angle of this SphericEmitter
 		*/
-		inline float getAngleMin() const;
+		float getAngleMin() const;
 
 		/**
 		* @brief Gets the maximum angle of this SphericEmitter
 		* @return the maximum angle of this SphericEmitter
 		*/
-		inline float getAngleMax() const;
+		float getAngleMax() const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_StaticEmitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_StaticEmitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_StaticEmitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_StaticEmitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -43,11 +43,11 @@
 		* @brief Creates and registers a new StaticEmitter
 		* @return A new registered StaticEmitter
 		*/
-		static inline StaticEmitter* create();
+		static StaticEmitter* create();
 
 	private :
 
-		virtual inline void generateVelocity(Particle& particle,float speed) const;
+		virtual void generateVelocity(Particle& particle,float speed) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_StraightEmitter.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_StraightEmitter.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Emitters/SPK_StraightEmitter.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Emitters/SPK_StraightEmitter.h	2013-05-01 13:12:52.000000000 +0000
@@ -54,7 +54,7 @@
 		* @param direction : the direction of the StraighEmitter
 		* @since 1.04.00
 		*/
-		static inline StraightEmitter* create(const Vector3D& direction = Vector3D(0.0f,0.0f,-1.0f));
+		static StraightEmitter* create(const Vector3D& direction = Vector3D(0.0f,0.0f,-1.0f));
 
 		/////////////
 		// Setters //
@@ -78,13 +78,13 @@
 		* @brief Gets the direction of this StraightEmitter
 		* @return the direction of this StraightEmitter
 		*/
-		inline const Vector3D& getDirection() const;
+		const Vector3D& getDirection() const;
 
 		/**
 		* @brief Gets the transformed direction of this StraightEmitter
 		* @return the transformed direction of this StraightEmitter
 		*/
-		inline const Vector3D& getTransformedDirection() const;
+		const Vector3D& getTransformedDirection() const;
 
 	protected :
 
@@ -95,7 +95,7 @@
 		Vector3D direction;
 		Vector3D tDirection;
 
-		virtual inline void generateVelocity(Particle& particle,float speed) const;
+		virtual void generateVelocity(Particle& particle,float speed) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Collision.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Collision.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Collision.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Collision.h	2013-05-01 13:12:52.000000000 +0000
@@ -78,7 +78,7 @@
 		* @param elasticity : the elasticity of the collisions
 		* @since 1.04.00
 		*/
-		static inline Collision* create(float scale = 1.0f,float elasticity = 1.0f);
+		static Collision* create(float scale = 1.0f,float elasticity = 1.0f);
 
 		/////////////
 		// Setters //
@@ -92,7 +92,7 @@
 		*
 		* @param scale : the scale of the particles
 		*/
-		inline void setScale(float scale);
+		void setScale(float scale);
 
 		/**
 		* @brief Sets the elasticity of the collisions
@@ -102,7 +102,7 @@
 		*
 		* @param elasticity : the elasticity of the collisions
 		*/
-		inline void setElasticity(float elasticity);
+		void setElasticity(float elasticity);
 
 		/////////////
 		// Getters //
@@ -112,13 +112,13 @@
 		* @brief Gets the elasticity of the collisions
 		* @return the elasticity of the collisions
 		*/
-		inline float getElasticity() const;
+		float getElasticity() const;
 
 		/**
 		* @brief Gets the scale applied on particle radius
 		* @return the scale
 		*/
-		inline float getScale() const;
+		float getScale() const;
 
 	private :
 
@@ -127,8 +127,8 @@
 
 		virtual void modify(Particle& particle,float deltaTime) const;
 
-		static inline void getMinMax(const Vector3D& v0,const Vector3D& v1,Vector3D& min,Vector3D& max);
-		static inline bool checkBoundingRect(const Vector3D& min1,const Vector3D& max1,const Vector3D& min2,const Vector3D& max2);
+		static void getMinMax(const Vector3D& v0,const Vector3D& v1,Vector3D& min,Vector3D& max);
+		static bool checkBoundingRect(const Vector3D& min1,const Vector3D& max1,const Vector3D& min2,const Vector3D& max2);
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Destroyer.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Destroyer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Destroyer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Destroyer.h	2013-05-01 13:12:52.000000000 +0000
@@ -56,7 +56,7 @@
 		* @return A new registered Destroyer
 		* @since 1.04.00
 		*/
-		static inline Destroyer* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE);
+		static Destroyer* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE);
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_LinearForce.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_LinearForce.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_LinearForce.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_LinearForce.h	2013-05-01 13:12:52.000000000 +0000
@@ -90,7 +90,7 @@
 		* @return A new registered LinearForce
 		* @since 1.04.00
 		*/
-		static inline LinearForce* create(Zone* zone = NULL,
+		static LinearForce* create(Zone* zone = NULL,
 			ModifierTrigger trigger = INSIDE_ZONE,
 			const Vector3D& force = Vector3D(),
 			ForceFactor type = FACTOR_NONE,
@@ -105,14 +105,14 @@
 		* @param force : the force vector
 		* @since 1.03.02
 		*/
-		inline void setForce(const Vector3D& force);
+		void setForce(const Vector3D& force);
 
 		/**
 		* @brief Sets the factor type to apply to the force
 		* @param type : the type of multiplier for the factor
 		* @param param : the parameter of the Particle to use as the factor
 		*/
-		inline void setFactor(ForceFactor type,ModelParam param = PARAM_SIZE);
+		void setFactor(ForceFactor type,ModelParam param = PARAM_SIZE);
 
 		/////////////
 		// Getters //
@@ -123,30 +123,30 @@
 		* @return the force vector
 		* @since 1.03.02
 		*/
-		inline const Vector3D& getForce() const;
+		const Vector3D& getForce() const;
 
 		/**
 		* @brief Gets the transformed force vector
 		* @return the transformed force vector
 		* @since 1.03.02
 		*/
-		inline const Vector3D& getTransformedForce() const;
+		const Vector3D& getTransformedForce() const;
 
 		/**
 		* @brief Gets the factor multiplier of this LinearForce
 		* @return the factor multiplier of this LinearForce
 		*/
-		inline ForceFactor getFactorType() const;
+		ForceFactor getFactorType() const;
 
 		/**
 		* @brief Gets the factor parameter of this LinearForce
 		* @return the factor parameter of this LinearForce
 		*/
-		inline ModelParam getFactorParam() const;
+		ModelParam getFactorParam() const;
 
 	protected :
 
-		virtual inline void innerUpdateTransform();
+		virtual void innerUpdateTransform();
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_ModifierGroup.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_ModifierGroup.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_ModifierGroup.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_ModifierGroup.h	2013-05-01 13:12:52.000000000 +0000
@@ -65,7 +65,7 @@
 		* @return A new registered ModifierGroup
 		* @since 1.04.00
 		*/
-		static inline ModifierGroup* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE);
+		static ModifierGroup* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE);
 
 		/////////////
 		// Setters //
@@ -83,7 +83,7 @@
 		* @param useIntersection : true to enable intersection computation in this ModifierGroup
 		* @param useNormal : true to enable normal computation in this ModifierGroup
 		*/
-		inline void useGlobalGroup(bool useIntersection = false,bool useNormal = false);
+		void useGlobalGroup(bool useIntersection = false,bool useNormal = false);
 
 		/**
 		* @brief Uses this ModifierGroup as a partition group
@@ -96,7 +96,7 @@
 		*
 		* @param handleWrongSide : true to enable intersection computation in this ModifierGroup
 		*/
-		inline void usePartitionGroup(bool handleWrongSide = false);
+		void usePartitionGroup(bool handleWrongSide = false);
 
 		/////////////
 		// Getters //
@@ -106,13 +106,13 @@
 		* @brief Gets the number of modifiers in this ModifierGroup
 		* @return the number of modifiers in this ModifierGroup
 		*/
-		inline size_t getNb() const;
+		size_t getNb() const;
 
 		/**
 		* @brief Gets the vector containing all the children modifiers
 		* @return the vector containing all the children modifiers
 		*/
-		inline const std::vector<Modifier*>& getModifiers() const;
+		const std::vector<Modifier*>& getModifiers() const;
 
 		/**
 		* @brief Tells whether this ModifierGroup is a global group
@@ -121,7 +121,7 @@
 		*
 		* @return true if this ModifierGroup is a global group, false if not
 		*/
-		inline bool isGlobalGroup() const;
+		bool isGlobalGroup() const;
 
 		/**
 		* @brief Tells whether this ModifierGroup is a partition group
@@ -130,7 +130,7 @@
 		*
 		* @return true if this ModifierGroup is a partition group, false if not
 		*/
-		inline bool isPartitionGroup() const;
+		bool isPartitionGroup() const;
 
 		/**
 		* @brief Tells whether this partition group handles wrong side
@@ -147,7 +147,7 @@
 		*
 		* @return true if this ModifierGroup handles wrong size, false if not
 		*/
-		inline bool handlesWrongSide() const;
+		bool handlesWrongSide() const;
 
 		/**
 		* @brief Tells whether this global group computes the intersection
@@ -163,7 +163,7 @@
 		*
 		* @return true if this ModifierGroup computes the intersection, false if not
 		*/
-		inline bool usesIntersection() const;
+		bool usesIntersection() const;
 
 		/**
 		* @brief Tells whether this global group computes the normal
@@ -179,7 +179,7 @@
 		*
 		* @return true if this ModifierGroup computes the normal, false if not
 		*/
-		inline bool usesNormal() const;
+		bool usesNormal() const;
 
 		///////////////
 		// Interface //
@@ -201,7 +201,7 @@
 		/**
 		* @brief Removes all Modifier children from this ModifierGroup
 		*/
-		inline void clear();
+		void clear();
 
 		virtual void createBuffers(const Group& group);
 		virtual void destroyBuffers(const Group& group);
@@ -211,7 +211,7 @@
 	protected :
 
 		virtual void registerChildren(bool registerAll);
-		virtual void copyChildren(const ModifierGroup& modifier,bool createBase);
+		virtual void copyChildren(const Registerable& object,bool createBase);
 		virtual void destroyChildren(bool keepChildren);
 
 		virtual bool checkBuffers(const Group& group);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Obstacle.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Obstacle.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Obstacle.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Obstacle.h	2013-05-01 13:12:52.000000000 +0000
@@ -61,7 +61,7 @@
 		* @return A new registered Obstacle
 		* @since 1.04.00
 		*/
-		static inline Obstacle* create(Zone* zone = NULL,ModifierTrigger trigger = INTERSECT_ZONE,float bouncingRatio = 1.0f,float friction = 1.0f);
+		static Obstacle* create(Zone* zone = NULL,ModifierTrigger trigger = INTERSECT_ZONE,float bouncingRatio = 1.0f,float friction = 1.0f);
 
 		/////////////
 		// Setters //
@@ -74,7 +74,7 @@
 		*
 		* @param bouncingRatio : the bouncing ratio of this Obstacle
 		*/
-		inline void setBouncingRatio(float bouncingRatio);
+		void setBouncingRatio(float bouncingRatio);
 
 		/**
 		* @brief Sets the friction of this Obstacle
@@ -83,7 +83,7 @@
 		*
 		* @param friction : the friction of this Obstacle
 		*/
-		inline void setFriction(float friction);
+		void setFriction(float friction);
 
 		/////////////
 		// Getters //
@@ -93,13 +93,13 @@
 		* @brief Gets the bouncing ratio of this Obstacle
 		* @return the bouncing ratio of this Obstacle
 		*/
-		inline float getBouncingRatio() const;
+		float getBouncingRatio() const;
 
 		/**
 		* @brief Gets the friction of this Obstacle
 		* @return the friction of this Obstacle
 		*/
-		inline float getFriction() const;
+		float getFriction() const;
 
 	private :
 
@@ -107,7 +107,7 @@
 		float friction;
 
 		virtual void modify(Particle& particle,float deltaTime) const;
-		virtual inline void modifyWrongSide(Particle& particle,bool inside) const;
+		virtual void modifyWrongSide(Particle& particle,bool inside) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_PointMass.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_PointMass.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_PointMass.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_PointMass.h	2013-05-01 13:12:52.000000000 +0000
@@ -63,7 +63,7 @@
 		* @return A new registered PointMass
 		* @since 1.04.00
 		*/
-		static inline PointMass* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE,float mass = 1.0f,float minDistance = 0.05f);
+		static PointMass* create(Zone* zone = NULL,ModifierTrigger trigger = INSIDE_ZONE,float mass = 1.0f,float minDistance = 0.05f);
 
 		/////////////
 		// Setters //
@@ -74,7 +74,7 @@
 		* @param pos : the delta position
 		* @since 1.03.02
 		*/
-		inline void setPosition(const Vector3D& pos);
+		void setPosition(const Vector3D& pos);
 
 		/**
 		* @brief Sets the mass of this PointMass
@@ -85,7 +85,7 @@
 		*
 		* @param mass : the mass of this PointMass
 		*/
-		inline void setMass(float mass);
+		void setMass(float mass);
 
 		/**
 		* @brief Sets the minimum distance of this PointMass
@@ -96,7 +96,7 @@
 		*
 		* @param minDistance : the minimum distance of this PointMass
 		*/
-		inline void setMinDistance(float minDistance);
+		void setMinDistance(float minDistance);
 
 		/////////////
 		// Getters //
@@ -107,30 +107,30 @@
 		* @return the delta position
 		* @since 1.03.02
 		*/
-		inline const Vector3D& getPosition() const;
+		const Vector3D& getPosition() const;
 
 		/**
 		* @brief Gets the transformed delta position
 		* @return the transformed delta position
 		* @since 1.03.02
 		*/
-		inline const Vector3D& getTransformedPosition() const;
+		const Vector3D& getTransformedPosition() const;
 
 		/**
 		* @brief Gets the mass of this PointMass
 		* @return the mass of this PointMass
 		*/
-		inline float getMass() const;
+		float getMass() const;
 
 		/**
 		* @brief Gets the minimum distance of this PointMass
 		* @return the minimum distance of this PointMass
 		*/
-		inline float getMinDistance() const;
+		float getMinDistance() const;
 
 	protected :
 
-		virtual inline void innerUpdateTransform();
+		virtual void innerUpdateTransform();
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Rotator.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Rotator.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Rotator.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Rotator.h	2013-05-01 13:12:52.000000000 +0000
@@ -51,17 +51,17 @@
 		/////////////////
 
 		/** @brief Constructor of Rotator */
-		inline Rotator();
+		Rotator();
 
 		/**
 		* @brief Creates and registers a new Rotator
 		* @return A new registered Rotator
 		*/
-		static inline Rotator* create();
+		static Rotator* create();
 
 	private :
 
-		virtual inline void modify(Particle& particle,float deltaTime) const;
+		virtual void modify(Particle& particle,float deltaTime) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Vortex.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Vortex.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Vortex.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Modifiers/SPK_Vortex.h	2013-05-01 13:12:52.000000000 +0000
@@ -78,7 +78,7 @@
 		* @param attractionSpeed : the speed of attraction
 		* @return a new registered vortex
 		*/
-		static inline Vortex* create(const Vector3D& position = Vector3D(),const Vector3D& direction = Vector3D(0.0f,1.0f,0.0f),float rotationSpeed = 1.0f,float attractionSpeed = 0.0f);
+		static Vortex* create(const Vector3D& position = Vector3D(),const Vector3D& direction = Vector3D(0.0f,1.0f,0.0f),float rotationSpeed = 1.0f,float attractionSpeed = 0.0f);
 
 		/////////////
 		// Setters //
@@ -91,7 +91,7 @@
 		*
 		* @param position : the position of the eye of the vortex
 		*/
-		inline void setPosition(const Vector3D& position);
+		void setPosition(const Vector3D& position);
 
 		/**
 		* @brief Sets the direction of the eye of the vortex
@@ -101,7 +101,7 @@
 		*
 		* @param direction : the direction of the eye of the vortex
 		*/
-		inline void setDirection(const Vector3D& direction);
+		void setDirection(const Vector3D& direction);
 
 		/**
 		* @brief Sets the rotation speed of the vortex
@@ -116,7 +116,7 @@
 		* @param rotationSpeed : the speed of rotation (either in units per unit of time or in radians per unit of time dependent on the second parameter)
 		* @param angular :  true to have the rotation in radians per unit of time, false to have it in unit per unit of time.
 		*/
-		inline void setRotationSpeed(float rotationSpeed,bool angular);
+		void setRotationSpeed(float rotationSpeed,bool angular);
 
 		/**
 		* @brief Sets the attraction speed of the vortex
@@ -133,7 +133,7 @@
 		* @param attractionSpeed : the attraction speed of the vortex in units per unit of time
 		* @param linear : true to set the speed function of the distance from the eye, false to set it constant
 		*/
-		inline void setAttractionSpeed(float attractionSpeed,bool linear);
+		void setAttractionSpeed(float attractionSpeed,bool linear);
 
 		/**
 		* @brief Sets the eye radius
@@ -142,13 +142,13 @@
 		*
 		* @param eyeRadius : the eye radius
 		*/
-		inline void setEyeRadius(float eyeRadius);
+		void setEyeRadius(float eyeRadius);
 
 		/**
 		* @brief Tells whether particles is the eye must be killed or not
 		* @param kill : true to kill particles in the eye, false not to
 		*/
-		inline void enableParticleKilling(bool kill);
+		void enableParticleKilling(bool kill);
 
 		/////////////
 		// Getters //
@@ -158,61 +158,61 @@
 		* @brief Gets the position of the eye
 		* @return the position of the eye
 		*/
-		inline const Vector3D& getPosition() const;
+		const Vector3D& getPosition() const;
 
 		/**
 		* @brief Gets the direction of the eye
 		* @return the direction of the eye (normalized)
 		*/
-		inline const Vector3D& getDirection() const;
+		const Vector3D& getDirection() const;
 
 		/**
 		* @brief Gets the transformed position of the eye
 		* @return the transformed position of the eye
 		*/
-		inline const Vector3D& getTransformedPosition() const;
+		const Vector3D& getTransformedPosition() const;
 
 		/**
 		* @brief Gets the transformed direction of the eye
 		* @return the transformed direction of the eye (normalized)
 		*/
-		inline const Vector3D& getTransformedDirection() const;
+		const Vector3D& getTransformedDirection() const;
 
 		/**
 		* @brief Gets the rotation speed
 		* @return the rotation speed
 		*/
-		inline float getRotationSpeed() const;
+		float getRotationSpeed() const;
 
 		/**
 		* @brief Gets the attraction speed
 		* @return the attraction speed
 		*/
-		inline float getAttractionSpeed() const;
+		float getAttractionSpeed() const;
 
 		/**
 		* @brief Tells whether rotation speed is angular
 		* @return true if rotation speed is angular, false if not
 		*/
-		inline bool isRotationSpeedAngular() const;
+		bool isRotationSpeedAngular() const;
 
 		/**
 		* @brief Tells whether attraction speed is function of the distance from the eye
 		* @return true if attraction speed is linear, false if it is constant
 		*/
-		inline bool isAttractionSpeedLinear() const;
+		bool isAttractionSpeedLinear() const;
 
 		/**
 		* @brief Returns the eye radius
 		* @return the eye radius
 		*/
-		inline float getEyeRadius() const;
+		float getEyeRadius() const;
 
 		/**
 		* @brief Tells whether particles are killed when in the eye
 		* @return true if particles are killed in the eye, false if not
 		*/
-		inline bool isParticleKillingEnabled() const;
+		bool isParticleKillingEnabled() const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_LineRendererInterface.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_LineRendererInterface.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_LineRendererInterface.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_LineRendererInterface.h	2013-05-01 13:12:52.000000000 +0000
@@ -44,14 +44,14 @@
 		* @param length : the length multiplier of this LineRendererInterface
 		* @param width : the width of this GLLineRenderer
 		*/
-		inline LineRendererInterface(float length = 1.0f,float width = 1.0f);
+		LineRendererInterface(float length = 1.0f,float width = 1.0f);
 
 		////////////////
 		// Destructor //
 		////////////////
 
 		/** @brief Destructor of LineRendererInterface */
-		virtual inline ~LineRendererInterface() {}
+		virtual ~LineRendererInterface() {}
 
 		/////////////
 		// Setters //
@@ -65,13 +65,13 @@
 		*
 		* @param length : the length multiplier of this GLLineRenderer
 		*/
-		inline void setLength(float length);
+		void setLength(float length);
 
 		/**
 		* @brief Sets the width of this LineRendererInterface
 		* @param width : the width of this LineRendererInterface
 		*/
-		virtual inline void setWidth(float width);
+		virtual void setWidth(float width);
 
 		/////////////
 		// Getters //
@@ -81,13 +81,13 @@
 		* @brief Gets the length multiplier of this LineRendererInterface
 		* @return the length multiplier of this LineRendererInterface
 		*/
-		inline float getLength() const;
+		float getLength() const;
 
 		/**
 		* @brief Gets the width of this LineRendererInterface
 		* @return the width of this LineRendererInterface
 		*/
-		inline float getWidth() const;
+		float getWidth() const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented2DRendererInterface.h	2013-05-01 13:12:52.000000000 +0000
@@ -70,14 +70,14 @@
 		//////////////////
 
 		/** @brief Constructor of Oriented2DRendererInterface */
-		inline Oriented2DRendererInterface();
+		Oriented2DRendererInterface();
 
 		////////////////
 		// Destructor //
 		////////////////
 
 		/** @brief Destructor of Oriented2DRendererInterface */
-		virtual inline ~Oriented2DRendererInterface() {}
+		virtual ~Oriented2DRendererInterface() {}
 
 		/////////////
 		// Setters //
@@ -87,7 +87,7 @@
 		* @brief Sets the way quads are oriented in the universe
 		* @param orientation : the orientation of the quad
 		*/
-		inline void setOrientation(Orientation2D orientation);
+		void setOrientation(Orientation2D orientation);
 
 		/////////////
 		// Getters //
@@ -97,21 +97,21 @@
 		* @brief Gets the orientation of the quads
 		* @return the orientation of the quads
 		*/
-		inline Orientation2D getOrientation() const;
+		Orientation2D getOrientation() const;
 
 	protected :
 
 		Orientation2D orientation;
 
-		inline bool hasGlobalOrientation();
-		inline void computeGlobalOrientation2D();
-		inline void computeSingleOrientation2D(const Particle& particle);
+		bool hasGlobalOrientation();
+		void computeGlobalOrientation2D();
+		void computeSingleOrientation2D(const Particle& particle);
 
-		inline void scaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
-		inline void rotateAndScaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
+		void scaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
+		void rotateAndScaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
 
-		inline const Vector3D& quadUp() const;
-		inline const Vector3D& quadSide() const;
+		const Vector3D& quadUp() const;
+		const Vector3D& quadSide() const;
 
 	private :
 
@@ -199,8 +199,8 @@
 		float size = particle.getParamCurrentValue(PARAM_SIZE);
 
 		float angleTexture = particle.getParamCurrentValue(PARAM_ANGLE);
-		float cosA = cos(angleTexture);
-		float sinA = sin(angleTexture);
+		float cosA = std::cos(angleTexture);
+		float sinA = std::sin(angleTexture);
 
 		upQuad.x = cosA * up.x + sinA * up.y;
 		upQuad.y = -sinA * up.x + cosA * up.y;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_Oriented3DRendererInterface.h	2013-05-01 13:12:52.000000000 +0000
@@ -139,7 +139,7 @@
 		////////////////
 
 		/** @brief Destructor of Oriented3DRendererInterface */
-		virtual inline ~Oriented3DRendererInterface() {}
+		virtual ~Oriented3DRendererInterface() {}
 
 		/////////////
 		// Setters //
@@ -177,19 +177,19 @@
 		* @brief Gets the look orientation of the quads
 		* @return the look orientation of the quads
 		*/
-		inline LookOrientation getLookOrientation() const;
+		LookOrientation getLookOrientation() const;
 
 		/**
 		* @brief Gets the up orientation of the quads
 		* @return the up orientation of the quads
 		*/
-		inline UpOrientation getUpOrientation() const;
+		UpOrientation getUpOrientation() const;
 
 		/**
 		* @brief Gets the locked axis (the one prevailing over the others)
 		* @return the locked axis
 		*/
-		inline LockedAxis getLockedAxis() const;
+		LockedAxis getLockedAxis() const;
 
 	protected :
 
@@ -198,15 +198,15 @@
 		UpOrientation upOrientation;
 		LockedAxis lockedAxis;
 
-		inline bool precomputeOrientation3D(const Group& group,const Vector3D& look,const Vector3D& up,const Vector3D& pos);
-		inline void computeGlobalOrientation3D();
-		inline void computeSingleOrientation3D(const Particle& particle);
+		bool precomputeOrientation3D(const Group& group,const Vector3D& look,const Vector3D& up,const Vector3D& pos);
+		void computeGlobalOrientation3D();
+		void computeSingleOrientation3D(const Particle& particle);
 
-		inline void scaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
-		inline void rotateAndScaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
+		void scaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
+		void rotateAndScaleQuadVectors(const Particle& particle,float scaleX,float scaleY) const;
 
-		inline const Vector3D& quadUp() const;
-		inline const Vector3D& quadSide() const;
+		const Vector3D& quadUp() const;
+		const Vector3D& quadSide() const;
 
 	private :
 
@@ -362,8 +362,8 @@
 		float size = particle.getParamCurrentValue(PARAM_SIZE);
 
 		float angleTexture = particle.getParamCurrentValue(PARAM_ANGLE);
-		float cosA = cos(angleTexture);
-		float sinA = sin(angleTexture);
+		float cosA = std::cos(angleTexture);
+		float sinA = std::sin(angleTexture);
 
 		upQuad.x = (look.x * look.x + (1.0f - look.x * look.x) * cosA) * up.x
 			+ (look.x * look.y * (1.0f - cosA) - look.z * sinA) * up.y
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_PointRendererInterface.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_PointRendererInterface.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_PointRendererInterface.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_PointRendererInterface.h	2013-05-01 13:12:52.000000000 +0000
@@ -55,14 +55,14 @@
 		* @param type : the initial type of this PointRendererInterface (must be supported by default by the platform)
 		* @param size : the width of this PointRendererInterface
 		*/
-		inline PointRendererInterface(PointType type = POINT_SQUARE,float size = 1.0f);
+		PointRendererInterface(PointType type = POINT_SQUARE,float size = 1.0f);
 
 		////////////////
 		// Destructor //
 		////////////////
 
 		/** @brief Destructor of PointRendererInterface */
-		virtual inline ~PointRendererInterface() {}
+		virtual ~PointRendererInterface() {}
 
 		/////////////
 		// Setters //
@@ -76,13 +76,13 @@
 		* @param type : the type of points to use in this PointRendererInterface
 		* @return true if the type can be set, false otherwise
 		*/
-		virtual inline bool setType(PointType type);
+		virtual bool setType(PointType type);
 
 		/**
 		* @brief Sets the size of the points in this PointRendererInterface
 		* @param size : the size of the points in this PointRendererInterface
 		*/
-		virtual inline void setSize(float size);
+		virtual void setSize(float size);
 
 		/////////////
 		// Getters //
@@ -92,13 +92,13 @@
 		* @brief Gets the type of points in this PointRendererInterface
 		* @return the type of points in this PointRendererInterface
 		*/
-		inline PointType getType() const;
+		PointType getType() const;
 
 		/**
 		* @brief Gets the size of points in this PointRendererInterface
 		* @return the size of points in this PointRendererInterface
 		*/
-		inline float getSize() const;
+		float getSize() const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_QuadRendererInterface.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_QuadRendererInterface.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Renderers/SPK_QuadRendererInterface.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Renderers/SPK_QuadRendererInterface.h	2013-05-01 13:12:52.000000000 +0000
@@ -65,7 +65,7 @@
 		////////////////
 
 		/** @brief Destructor of QuadRendererInterface */
-		virtual inline ~QuadRendererInterface() {}
+		virtual ~QuadRendererInterface() {}
 
 		/////////////
 		// Setters //
@@ -83,7 +83,7 @@
 		* @param mode : the texturing mode of this GLQuadRenderer
 		* @return true if the rendering mode can be set, false if it cannot
 		*/
-		virtual inline bool setTexturingMode(TexturingMode mode);
+		virtual bool setTexturingMode(TexturingMode mode);
 
 		/**
 		* @brief Sets the cut of the texture
@@ -123,7 +123,7 @@
 		* @param scaleX : the scale of the width of the quad
 		* @param scaleY : the scale of the height of the quad
 		*/
-		inline void setScale(float scaleX,float scaleY);
+		void setScale(float scaleX,float scaleY);
 
 		/////////////
 		// Getters //
@@ -133,7 +133,7 @@
 		* @brief Gets the texturing mode of this GLQuadRenderer
 		* @return the texturing mode of this GLQuadRenderer
 		*/
-		inline TexturingMode getTexturingMode() const;
+		TexturingMode getTexturingMode() const;
 
 		/**
 		* @brief Gets the atlas dimension on the X axis
@@ -142,7 +142,7 @@
 		*
 		* @return the atlas dimension on the X axis
 		*/
-		inline size_t getAtlasDimensionX() const;
+		size_t getAtlasDimensionX() const;
 
 		/**
 		* @brief Gets the atlas dimension on the Y axis
@@ -151,19 +151,19 @@
 		*
 		* @return the atlas dimension on the Y axis
 		*/
-		inline size_t getAtlasDimensionY() const;
+		size_t getAtlasDimensionY() const;
 
 		/**
 		* @brief Gets the scale of the width of this GLQuadRenderer
 		* @return the scale of the width of this GLQuadRenderer
 		*/
-		inline float getScaleX() const;
+		float getScaleX() const;
 
 		/**
 		* @brief Gets the scale of the height of this GLQuadRenderer
 		* @return the scale of the height of this GLQuadRenderer
 		*/
-		inline float getScaleY() const;
+		float getScaleY() const;
 
 	protected :
 
@@ -178,12 +178,12 @@
 		float textureAtlasW;
 		float textureAtlasH;
 
-		inline void computeAtlasCoordinates(const Particle& particle) const;
+		void computeAtlasCoordinates(const Particle& particle) const;
 
-		inline float textureAtlasU0() const;
-		inline float textureAtlasU1() const;
-		inline float textureAtlasV0() const;
-		inline float textureAtlasV1() const;
+		float textureAtlasU0() const;
+		float textureAtlasU1() const;
+		float textureAtlasV0() const;
+		float textureAtlasV1() const;
 
 	private :
 
@@ -256,7 +256,7 @@
 	{
 		int textureIndex = static_cast<int>(particle.getParamCurrentValue(PARAM_TEXTURE_INDEX));
 		atlasU0 = atlasU1 = static_cast<float>(textureIndex % textureAtlasNbX) / textureAtlasNbX;
-		atlasV0 = atlasV1 = static_cast<float>(textureIndex / textureAtlasNbY) / textureAtlasNbY;
+		atlasV0 = atlasV1 = static_cast<float>(textureIndex / textureAtlasNbX) / textureAtlasNbY;
 		atlasU1 += textureAtlasW;
 		atlasV1 += textureAtlasH;
 	}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_AABox.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_AABox.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_AABox.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_AABox.h	2013-05-01 13:12:52.000000000 +0000
@@ -56,7 +56,7 @@
 		* @param dimension : the dimension of the AABox
 		* @since 1.04.00
 		*/
-		static inline AABox* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& dimension = Vector3D(0.0f,0.0f,0.0f));
+		static AABox* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& dimension = Vector3D(0.0f,0.0f,0.0f));
 
 		////////////
 		// Setter //
@@ -80,7 +80,7 @@
 		* @brief Gets the dimensions of this AABox
 		* @return the dimensions of this AABox
 		*/
-		inline const Vector3D& getDimension() const;
+		const Vector3D& getDimension() const;
 
 		///////////////
 		// Interface //
@@ -96,7 +96,7 @@
 
 		Vector3D dimension;
 
-		inline bool slabIntersects(float p0,float p1,float bMin,float bMax,float& tEnter,float& tExit,int& firstAxis,int axis) const;
+		bool slabIntersects(float p0,float p1,float bMin,float bMax,float& tEnter,float& tExit,int& firstAxis,int axis) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Cylinder.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Cylinder.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Cylinder.h	1970-01-01 00:00:00.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Cylinder.h	2013-05-01 13:12:52.000000000 +0000
@@ -0,0 +1,202 @@
+//////////////////////////////////////////////////////////////////////////////////
+// SPARK particle engine														//
+// Copyright (C) 2008-2010                                                      //
+//  - Julien Fryer - julienfryer@gmail.com				                        //
+//  - Thibault Lescoat -  info-tibo <at> orange <dot> fr						//
+//																				//
+// This software is provided 'as-is', without any express or implied			//
+// warranty.  In no event will the authors be held liable for any damages		//
+// arising from the use of this software.										//
+//																				//
+// Permission is granted to anyone to use this software for any purpose,		//
+// including commercial applications, and to alter it and redistribute it		//
+// freely, subject to the following restrictions:								//
+//																				//
+// 1. The origin of this software must not be misrepresented; you must not		//
+//    claim that you wrote the original software. If you use this software		//
+//    in a product, an acknowledgment in the product documentation would be		//
+//    appreciated but is not required.											//
+// 2. Altered source versions must be plainly marked as such, and must not be	//
+//    misrepresented as being the original software.							//
+// 3. This notice may not be removed or altered from any source distribution.	//
+//////////////////////////////////////////////////////////////////////////////////
+
+#ifndef H_SPK_CYLINDER
+#define H_SPK_CYLINDER
+
+#include "Core/SPK_Zone.h"
+
+namespace SPK
+{
+	/**
+	* @brief A Zone defining a cylinder in the universe
+	*
+	* A cylinder is defined by :
+	* <ul>
+	* <li>The position of its center</li>
+	* <li>A direction</li>
+	* <li>The radius of the cylinder</li>
+	* <li>A dimension (length) along the direction</li>
+	* </ul>
+	* Note that the direction does not have to be normalized as it is normalized internally when set.
+	*
+	* @since 1.05.03
+	*/
+	class SPK_PREFIX Cylinder : public Zone
+	{
+		SPK_IMPLEMENT_REGISTERABLE(Cylinder)
+
+	public :
+
+		//////////////////
+		// Constructors //
+		//////////////////
+
+		/**
+		* @brief Constructor of cylinder
+		* @param position : the position of the cylinder
+		* @param direction : the direction of the cylinder
+		* @param radius : the  radius of the cylinder
+		*/
+		Cylinder(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& direction = Vector3D(0.0f,1.0f,0.0f),float radius = 1.0f,float length = 1.0f);
+
+		/**
+		* @brief Creates and registers a new cylinder
+		* @param position : the position of the cylinder
+		* @param direction : the direction of the cylinder
+		* @param radius : the  radius of the cylinder
+		* @return a new registered cylinder
+		*/
+		static Cylinder* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& direction = Vector3D(0.0f,1.0f,0.0f),float radius = 1.0f,float length = 1.0f);
+
+		/////////////
+		// Setters //
+		/////////////
+
+		/**
+		* @brief Sets the direction of the cylinder
+		*
+		* Note that the direction is normalized internally
+		*
+		* @param direction : the direction of the cylinder
+		*/
+		void setDirection(const Vector3D& direction);
+
+		/**
+		* @brief Sets the radius of this cylinder
+		*
+		* A radius cannot be negative.<br>
+		* Note that negative radius are inverted internally
+		*
+		* @param radius : the radius of this cylinder
+		*/
+		void setRadius(float radius);
+
+		/**
+		* @brief Sets the length of this cylinder
+		*
+		* A length cannot be negative.<br>
+		* Note that negative length are inverted internally
+		*
+		* @param length : the length of this cylinder
+		*/
+		void setLength(float length);
+
+		/////////////
+		// Getters //
+		/////////////
+
+		/**
+		* @brief Gets the direction of this cylinder
+		* @return the direction of this cylinder
+		*/
+		const Vector3D& getDirection() const;
+
+		/**
+		* @brief Gets the transformed direction of this cylinder
+		* @return the transformed direction of this cylinder
+		*/
+		const Vector3D& getTransformedDirection() const;
+
+		/**
+		* @brief Gets the radius of this cylinder
+		* @return the radius of this cylinder
+		*/
+		float getRadius() const;
+
+		/**
+		* @brief Gets the length of this cylinder
+		* @return the length of this cylinder
+		*/
+		float getLength() const;
+
+		///////////////
+		// Interface //
+		///////////////
+
+		virtual void generatePosition(Particle& particle,bool full) const;
+		virtual bool contains(const Vector3D& v) const;
+		virtual bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
+		virtual void moveAtBorder(Vector3D& v,bool inside) const;
+		virtual Vector3D computeNormal(const Vector3D& point) const;
+
+	protected :
+
+		virtual void innerUpdateTransform();
+
+	private :
+
+		Vector3D direction;
+		Vector3D tDirection;
+
+		float radius,length;
+	};
+
+
+	inline Cylinder* Cylinder::create(const Vector3D& position,const Vector3D& direction,float radius,float length)
+	{
+		Cylinder* obj = new Cylinder(position,direction,radius,length);
+		registerObject(obj);
+		return obj;
+	}
+
+	inline void Cylinder::setDirection(const Vector3D& direction)
+	{
+		this->direction = direction;
+		this->direction.normalize();
+		tDirection = this->direction;
+		notifyForUpdate();
+	}
+
+	inline void Cylinder::setRadius(float radius)
+	{
+	    this->radius = (radius < 0 ? -radius : radius);
+	}
+
+	inline void Cylinder::setLength(float length)
+	{
+	    this->length = (length < 0 ? -length : length);
+	}
+
+	inline const Vector3D& Cylinder::getDirection() const
+	{
+		return direction;
+	}
+
+	inline const Vector3D& Cylinder::getTransformedDirection() const
+	{
+		return tDirection;
+	}
+
+	inline float Cylinder::getRadius() const
+	{
+		return radius;
+	}
+
+	inline float Cylinder::getLength() const
+	{
+	    return length;
+	}
+}
+
+#endif
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Line.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Line.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Line.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Line.h	2013-05-01 13:12:52.000000000 +0000
@@ -62,7 +62,7 @@
 		* @param p1 : the second bound of this Line
 		* @since 1.04.00
 		*/
-		static inline Line* create(const Vector3D& p0 = Vector3D(0.0f,0.0f,0.0f),const Vector3D& p1 = Vector3D(0.0f,0.0f,0.0f));
+		static Line* create(const Vector3D& p0 = Vector3D(0.0f,0.0f,0.0f),const Vector3D& p1 = Vector3D(0.0f,0.0f,0.0f));
 
 		/////////////
 		// Setters //
@@ -87,7 +87,7 @@
 		* @return the first bound of index of this Line
 		* @since 1.03.00
 		*/
-		inline const Vector3D& getBound(size_t index) const;
+		const Vector3D& getBound(size_t index) const;
 
 		/**
 		* @brief Gets the transformed bound of index of this Line
@@ -95,7 +95,7 @@
 		* @return the transformed bound of index of this Line
 		* @since 1.03.00
 		*/
-		inline const Vector3D& getTransformedBound(size_t index) const;
+		const Vector3D& getTransformedBound(size_t index) const;
 
 		///////////////
 		// Interface //
@@ -112,9 +112,9 @@
 		void pushBound(const Vector3D& bound);
 
 		virtual void generatePosition(Particle& particle,bool full) const;
-		virtual inline bool contains(const Vector3D& v) const;
-		virtual inline bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
-		virtual inline void moveAtBorder(Vector3D& v,bool inside) const;
+		virtual bool contains(const Vector3D& v) const;
+		virtual bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
+		virtual void moveAtBorder(Vector3D& v,bool inside) const;
 		virtual Vector3D computeNormal(const Vector3D& point) const;
 
 	protected :
@@ -128,8 +128,8 @@
 
 		Vector3D tDist;
 
-		inline void computeDist();
-		inline void computePosition();
+		void computeDist();
+		void computePosition();
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Plane.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Plane.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Plane.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Plane.h	2013-05-01 13:12:52.000000000 +0000
@@ -66,7 +66,7 @@
 		* @return a new registered plane
 		* @since 1.04.00
 		*/
-		static inline Plane* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& normal = Vector3D(0.0f,1.0f,0.0f));
+		static Plane* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& normal = Vector3D(0.0f,1.0f,0.0f));
 
 		/////////////
 		// Setters //
@@ -79,7 +79,7 @@
 		*
 		* @param normal :  the normal of this Plane
 		*/
-		inline void setNormal(const Vector3D& normal);
+		void setNormal(const Vector3D& normal);
 
 		/////////////
 		// Getters //
@@ -89,24 +89,24 @@
 		* @brief Gets the normal of this Plane
 		* @return the normal of this Plane
 		*/
-		inline const Vector3D& getNormal() const;
+		const Vector3D& getNormal() const;
 
 		/**
 		* @brief Gets the transformed normal of this Plane
 		* @return the transformed normal of this Plane
 		* @since 1.05.00
 		*/
-		inline const Vector3D& getTransformedNormal() const;
+		const Vector3D& getTransformedNormal() const;
 
 		///////////////
 		// Interface //
 		///////////////
 
-		virtual inline void generatePosition(Particle& particle,bool full) const;
-		virtual inline bool contains(const Vector3D& v) const;
+		virtual void generatePosition(Particle& particle,bool full) const;
+		virtual bool contains(const Vector3D& v) const;
 		virtual bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
 		virtual void moveAtBorder(Vector3D& v,bool inside) const;
-		virtual inline Vector3D computeNormal(const Vector3D& point) const;
+		virtual Vector3D computeNormal(const Vector3D& point) const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Point.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Point.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Point.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Point.h	2013-05-01 13:12:52.000000000 +0000
@@ -55,13 +55,13 @@
 		* @return A new registered Point
 		* @since 1.04.00
 		*/
-		static inline Point* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f));
+		static Point* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f));
 
 		// Interface
-		virtual inline void generatePosition(Particle& particle,bool full) const;
-		virtual inline bool contains(const Vector3D& v) const;
-		virtual inline bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
-		virtual inline void moveAtBorder(Vector3D& v,bool inside) const;
+		virtual void generatePosition(Particle& particle,bool full) const;
+		virtual bool contains(const Vector3D& v) const;
+		virtual bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
+		virtual void moveAtBorder(Vector3D& v,bool inside) const;
 		virtual Vector3D computeNormal(const Vector3D& point) const;
 	};
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Ring.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Ring.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Ring.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Ring.h	2013-05-01 13:12:52.000000000 +0000
@@ -67,7 +67,7 @@
 		* @param maxRadius : the maximum radius of the ring
 		* @return a new registered ring
 		*/
-		static inline Ring* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& normal = Vector3D(0.0f,1.0f,0.0f),float minRadius = 0.0f,float maxRadius = 1.0f);
+		static Ring* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),const Vector3D& normal = Vector3D(0.0f,1.0f,0.0f),float minRadius = 0.0f,float maxRadius = 1.0f);
 
 		/////////////
 		// Setters //
@@ -80,7 +80,7 @@
 		*
 		* @param normal : the normal of the plane on which lies the ring
 		*/
-		inline void setNormal(const Vector3D& normal);
+		void setNormal(const Vector3D& normal);
 
 		/**
 		* @brief Sets the min and max radius of this ring
@@ -101,35 +101,35 @@
 		* @brief Gets the normal of this ring
 		* @return the normal of this ring
 		*/
-		inline const Vector3D& getNormal() const;
+		const Vector3D& getNormal() const;
 
 		/**
 		* @brief Gets the transformed normal of this ring
 		* @return the transformed normal of this ring
 		*/
-		inline const Vector3D& getTransformedNormal() const;
+		const Vector3D& getTransformedNormal() const;
 
 		/**
 		* @brief Gets the minimum radius of this ring
 		* @return the minimum radius of this ring
 		*/
-		inline float getMinRadius() const;
+		float getMinRadius() const;
 
 		/**
 		* @brief Gets the maximum radius of this ring
 		* @return the maximum radius of this ring
 		*/
-		inline float getMaxRadius() const;
+		float getMaxRadius() const;
 
 		///////////////
 		// Interface //
 		///////////////
 
 		virtual void generatePosition(Particle& particle,bool full) const;
-		virtual inline bool contains(const Vector3D& v) const;
+		virtual bool contains(const Vector3D& v) const;
 		virtual bool intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const;
 		virtual void moveAtBorder(Vector3D& v,bool inside) const;
-		virtual inline Vector3D computeNormal(const Vector3D& point) const;
+		virtual Vector3D computeNormal(const Vector3D& point) const;
 
 	protected :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Sphere.h maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Sphere.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/Extensions/Zones/SPK_Sphere.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/Extensions/Zones/SPK_Sphere.h	2013-05-01 13:12:52.000000000 +0000
@@ -55,7 +55,7 @@
 		* @return A new registered Sphere
 		* @since 1.04.00
 		*/
-		static inline Sphere* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),float radius = 0.0f);
+		static Sphere* create(const Vector3D& position = Vector3D(0.0f,0.0f,0.0f),float radius = 0.0f);
 
 		////////////
 		// Setter //
@@ -68,7 +68,7 @@
 		*
 		* @param radius : the radius of this Sphere
 		*/
-		inline void setRadius(float radius);
+		void setRadius(float radius);
 
 		////////////
 		// Getter //
@@ -78,7 +78,7 @@
 		* @brief Gets the radius of this Sphere
 		* @return the radius of this Sphere
 		*/
-		inline float getRadius() const;
+		float getRadius() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRBuffer.h	2013-05-01 13:12:52.000000000 +0000
@@ -68,7 +68,7 @@
 		*
 		* @param init : true if VBOs are initialized, false of not
 		*/
-		inline void setVBOInitialized(bool init);
+		void setVBOInitialized(bool init);
 
 		/**
 		* @brief Tells the amount of data that are used by the buffer
@@ -77,7 +77,7 @@
 		*
 		* @param nb : the amount of data that are used by the buffer
 		*/
-		inline void setUsed(size_t nb);
+		void setUsed(size_t nb);
 
 
 		/////////////
@@ -88,19 +88,19 @@
 		* @brief Gets the inner vertex buffer
 		* @return the inner vertex buffer
 		*/
-		inline irr::scene::IVertexBuffer& getVertexBuffer();
+		irr::scene::IVertexBuffer& getVertexBuffer();
 
 		/**
 		* @brief Gets the inner index buffer
 		* @return the inner index buffer
 		*/
-		inline irr::scene::IIndexBuffer& getIndexBuffer();
+		irr::scene::IIndexBuffer& getIndexBuffer();
 
 		/**
 		* @brief Gets the inner mesh buffer
 		* @return the inner mesh buffer
 		*/
-		inline irr::scene::IDynamicMeshBuffer& getMeshBuffer();
+		irr::scene::IDynamicMeshBuffer& getMeshBuffer();
 
 		/**
 		* @brief Tells whether VBOs are initialized for this buffer
@@ -109,7 +109,7 @@
 		*
 		* @return true if VBOs are initialized, false of not
 		*/
-		inline bool areVBOInitialized() const;
+		bool areVBOInitialized() const;
 
 
 		////////////
@@ -136,7 +136,7 @@
 		* @return true if VBO hint is activated, alse if not
 		* @since 1.05.03
 		*/
-		static inline bool isVBOHintActivated();
+		static bool isVBOHintActivated();
 
     private:
 
@@ -231,68 +231,3 @@
 }}
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	//inline irr::video::E_INDEX_TYPE IRRBuffer::getIndexType() const
-	//{
-	//	return IndexType;
-	//}
-
-	//inline int IRRBuffer::getPurpose() const
-	//{ 
-	//	return Purpose;
-	//}
-
-	//IRRBuffer* IRRBuffer::clone() const
-	//{
- //       return new IRRBuffer(*this);
- //   }
-
- //   inline void IRRBuffer::swapPoints(irr::u32 i, irr::u32 j)
- //   {
- //       irr::video::S3DVertex temp = Vertices[i];
- //       Vertices[i] = Vertices[j];
- //       Vertices[j] = temp;
- //   }
-
- //   inline void IRRBuffer::swapLines(irr::u32 i, irr::u32 j)
- //   {
- //       irr::video::S3DVertex temp1 = Vertices[i*2];
- //       irr::video::S3DVertex temp2 = Vertices[i*2+1];
- //       Vertices[i*2] = Vertices[j*2];
- //       Vertices[i*2+1] = Vertices[j*2+1];
- //       Vertices[j*2] = temp1;
- //       Vertices[j*2+1] = temp2;
- //   }
-
- //   inline void IRRBuffer::swapQuads(irr::u32 i, irr::u32 j)
- //   {
- //       irr::video::S3DVertex temp0 = Vertices[i*4+0],
- //                             temp1 = Vertices[i*4+1],
- //                             temp2 = Vertices[i*4+2],
- //                             temp3 = Vertices[i*4+3];
- //       Vertices[4*i+0] = Vertices[4*j+0];
- //       Vertices[4*i+0] = Vertices[4*j+1];
- //       Vertices[4*i+0] = Vertices[4*j+2];
- //       Vertices[4*i+0] = Vertices[4*j+3];
- //       Vertices[4*j+0] = temp0;
- //       Vertices[4*j+1] = temp1;
- //       Vertices[4*j+2] = temp2;
- //       Vertices[4*j+3] = temp3;
- //   }
-
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRLineRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -73,13 +73,13 @@
 		* @param width : the width of this IRRLineRenderer in pixels
 		* @return A new registered IRRLineRenderer
 		*/
-		static inline IRRLineRenderer* create(irr::IrrlichtDevice* d,float length = 1.0f,float width = 1.0f);
+		static IRRLineRenderer* create(irr::IrrlichtDevice* d,float length = 1.0f,float width = 1.0f);
 
 		/////////////
 		// Setters //
 		/////////////
 
-		virtual inline void setWidth(float width);
+		virtual void setWidth(float width);
 
 		///////////////
 		// Interface //
@@ -97,7 +97,7 @@
 		// buffer name
 		static const std::string IRR_BUFFER_NAME;
 
-		inline virtual const std::string& getBufferName() const;
+		virtual const std::string& getBufferName() const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRPointRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -80,7 +80,7 @@
 		* @param size : the size of the points
 		* @return A new registered IRRPointRenderer
 		*/
-		static inline IRRPointRenderer* create(irr::IrrlichtDevice* d,float size = 1.0f);
+		static IRRPointRenderer* create(irr::IrrlichtDevice* d,float size = 1.0f);
 
 		/////////////
 		// Setters //
@@ -93,11 +93,11 @@
 		*
 		* @param texture : the texture to set
 		*/
-		inline void setTexture(irr::video::ITexture* texture);
+		void setTexture(irr::video::ITexture* texture);
 
 		// Reimplemented from PointRendererInterface
 		virtual bool setType(PointType type);
-		virtual inline void setSize(float size);
+		virtual void setSize(float size);
 
 		/////////////
 		// Getters //
@@ -107,19 +107,19 @@
 		* @brief Gets the texture of this renderer
 		* @return the texture of this renderer
 		*/
-		inline irr::video::ITexture* getTexture() const;
+		irr::video::ITexture* getTexture() const;
 
 		/**
 		* @brief Gets the material texture layer
 		* @return the material texture layer
 		*/
-		inline irr::video::SMaterialLayer& getMaterialLayer();
+		irr::video::SMaterialLayer& getMaterialLayer();
 
 		/**
 		* @brief Gets the material texture layer in a constant way
 		* @return the material texture layer
 		*/
-		inline const irr::video::SMaterialLayer& getMaterialLayer() const;
+		const irr::video::SMaterialLayer& getMaterialLayer() const;
 
 		///////////////
 		// Interface //
@@ -137,8 +137,8 @@
 		// buffer name
 		static const std::string IRR_BUFFER_NAME;
 
-		inline virtual const std::string& getBufferName() const;
-		inline virtual int getBufferPurpose() const;
+		virtual const std::string& getBufferName() const;
+		virtual int getBufferPurpose() const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRQuadRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -79,7 +79,7 @@
 		* @return A new registered IRRQuadRenderer
 		* @since 1.04.00
 		*/
-		static inline IRRQuadRenderer* create(irr::IrrlichtDevice* d,float scaleX = 1.0f,float scaleY = 1.0f);
+		static IRRQuadRenderer* create(irr::IrrlichtDevice* d,float scaleX = 1.0f,float scaleY = 1.0f);
 
 		/////////////
 		// Setters //
@@ -92,7 +92,7 @@
 		*
 		* @param texture : the texture to set
 		*/
-		inline void setTexture(irr::video::ITexture* texture);
+		void setTexture(irr::video::ITexture* texture);
 
 		/**
 		* @brief Sets the atlas dimension of the texture in an Irrlicht way
@@ -101,7 +101,7 @@
 		*
 		* @param dim : the atlas dimension of the texture
 		*/
-		inline void setAtlasDimensions(irr::core::dimension2du dim);
+		void setAtlasDimensions(irr::core::dimension2du dim);
 		using QuadRendererInterface::setAtlasDimensions;
 
 		/////////////
@@ -112,25 +112,25 @@
 		* @brief Gets the texture of this renderer
 		* @return the texture of this renderer
 		*/
-		inline irr::video::ITexture* getTexture() const;
+		irr::video::ITexture* getTexture() const;
 
 		/**
 		* @brief Gets the material texture layer
 		* @return the material texture layer
 		*/
-		inline irr::video::SMaterialLayer& getMaterialLayer();
+		irr::video::SMaterialLayer& getMaterialLayer();
 
 		/**
 		* @brief Gets the material texture layer in a constant way
 		* @return the material texture layer
 		*/
-		inline const irr::video::SMaterialLayer& getMaterialLayer() const;
+		const irr::video::SMaterialLayer& getMaterialLayer() const;
 
 		/**
 		* @brief Gets the atlas dimension of the texture in an Irrlicht way
 		* @return the atlas dimension of the texture
 		*/
-        inline irr::core::dimension2du getAtlasDimensions() const;
+        irr::core::dimension2du getAtlasDimensions() const;
 
 		///////////////
 		// Interface //
@@ -148,10 +148,10 @@
 		// buffer name
 		static const std::string IRR_BUFFER_NAME;
 
-		inline virtual const std::string& getBufferName() const;
+		virtual const std::string& getBufferName() const;
 
-		inline void FillBufferColorAndVertex(const Particle& particle) const;	// Fills Irrlicht buffer with color and position
-		inline void FillBufferTextureAtlas(const Particle& particle) const;		// Fills Irrlicht buffer with atlas texture coordinates
+		void FillBufferColorAndVertex(const Particle& particle) const;	// Fills Irrlicht buffer with color and position
+		void FillBufferTextureAtlas(const Particle& particle) const;		// Fills Irrlicht buffer with atlas texture coordinates
 
 		static void (IRRQuadRenderer::*renderParticle)(const Particle&)  const;	// pointer to the right render method
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -63,7 +63,7 @@
 		////////////////
 
 		/** @brief Destructor of IRRRenderer */
-		inline virtual ~IRRRenderer(){};
+		virtual ~IRRRenderer(){};
 
 		/////////////
 		// Setters //
@@ -84,7 +84,7 @@
 		virtual void setBlending(BlendingMode blendMode);
 
 		virtual void enableRenderingHint(RenderingHint renderingHint,bool enable);
-		virtual inline void setAlphaTestThreshold(float alphaThreshold);
+		virtual void setAlphaTestThreshold(float alphaThreshold);
 
 		/////////////
 		// Getters //
@@ -94,25 +94,25 @@
 		* @brief Gets the Irrlicht device of this renderer
 		* @return the device of this renderer
 		*/
-        inline irr::IrrlichtDevice* getDevice() const;
+        irr::IrrlichtDevice* getDevice() const;
 
 		/**
 		* @brief Gets the source blending funtion of this renderer
 		* @return the source blending funtion of this renderer
 		*/
-		inline irr::video::E_BLEND_FACTOR getBlendSrcFunc() const;
+		irr::video::E_BLEND_FACTOR getBlendSrcFunc() const;
 
 		/**
 		* @brief Gets the destination blending funtion of this renderer
 		* @return the destination blending funtion of this renderer
 		*/
-		inline irr::video::E_BLEND_FACTOR getBlendDestFunc() const;
+		irr::video::E_BLEND_FACTOR getBlendDestFunc() const;
 
 		/**
 		* @brief Gets the alpha source of this renderer
 		* @return the alpha source of this renderer
 		*/
-		inline unsigned int getAlphaSource() const;
+		unsigned int getAlphaSource() const;
 
 		/**
 		* @brief Gets the material of this renderer
@@ -121,7 +121,7 @@
 		*
 		* @return the material of this renderer
 		*/
-		inline const irr::video::SMaterial& getMaterial() const;
+		const irr::video::SMaterial& getMaterial() const;
 
 		virtual bool isRenderingHintEnabled(RenderingHint renderingHint) const;
 
@@ -129,7 +129,7 @@
 		// Interface //
 		///////////////
 
-		virtual inline void destroyBuffers(const Group& group);
+		virtual void destroyBuffers(const Group& group);
 
 	protected :
 
@@ -138,8 +138,8 @@
 
 		mutable IRRBuffer* currentBuffer;
 
-		virtual inline bool checkBuffers(const Group& group);
-		static inline unsigned int getVBOFlag();
+		virtual bool checkBuffers(const Group& group);
+		static unsigned int getVBOFlag();
 
 	private :
 
@@ -156,7 +156,7 @@
 		*/
 		virtual const std::string& getBufferName() const = 0;
 
-		inline void updateMaterialBlendingMode();
+		void updateMaterialBlendingMode();
 	};
 
 	
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/Irrlicht/SPK_IRRSystem.h	2013-05-01 13:12:52.000000000 +0000
@@ -76,7 +76,7 @@
 		* @param id : the ID of the node
 		* @return A new registered IRRSystem
 		*/
-		static inline IRRSystem* create(irr::scene::ISceneNode* parent,irr::scene::ISceneManager* mgr,bool worldTransformed = true,irr::s32 id=-1);
+		static IRRSystem* create(irr::scene::ISceneNode* parent,irr::scene::ISceneManager* mgr,bool worldTransformed = true,irr::s32 id=-1);
 
 		/////////////
 		// Setters //
@@ -87,7 +87,7 @@
 		* @param enableState : True to enable auto-update, false to disable it
         * @param onlyWhenVisible : True to perform auto-update only if node is visible. This parameter is ignored if auto-update is set to false.
 		*/
-        inline void setAutoUpdateEnabled(bool enableState, bool onlyWhenVisible);
+        void setAutoUpdateEnabled(bool enableState, bool onlyWhenVisible);
 
 		/////////////
 		// Getters //
@@ -100,13 +100,13 @@
 		*
 		* @return true if auto-update is enabled, false if disabled
 		*/
-        inline bool isAutoUpdateEnabled() const;
+        bool isAutoUpdateEnabled() const;
 
 		/**
 		* @brief Returns true if auto-update is performed only when visible
 		* @return True if particles are updated only if the scene node is visible (use setVisible() to change visibility).
 		*/
-        inline bool isUpdateOnlyWhenVisible() const;
+        bool isUpdateOnlyWhenVisible() const;
 
 		/**
 		* @brief Tells whether this system is world transformed or not
@@ -118,7 +118,7 @@
 		*
 		* @return true if this system is world transformed, false if not
 		*/
-		inline bool isWorldTransformed() const;
+		bool isWorldTransformed() const;
 
 		/** 
 		* @brief Gets the bounding box
@@ -142,20 +142,20 @@
 		*
 		* @return true if the system has finished, false otherwise
 		*/
-		inline bool hasFinished() const;
+		bool hasFinished() const;
 
 		///////////////
 		// Interface //
 		///////////////
 
-		virtual inline bool update(float deltaTime);
+		virtual bool update(float deltaTime);
 
 		/** 
 		* @brief Renders the particles in the system 
 		* 
 		* (Reimplementation of the irr::scene::SceneNode render method.)
 		*/
-		virtual inline void render();
+		virtual void render();
 
         /** 
 		* @brief Renders the particles in the system 
@@ -191,8 +191,8 @@
         mutable irr::core::aabbox3d<irr::f32> BBox;
 		mutable irr::u32 lastUpdatedTime;
 
-		virtual inline void onRegister();
-		virtual inline void onUnregister();
+		virtual void onRegister();
+		virtual void onUnregister();
 
 		// This sets the right camera position if distance computation is enabled for a group of the system
 		void updateCameraPosition() const;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLExtHandler.h	2013-05-01 13:12:52.000000000 +0000
@@ -196,7 +196,7 @@
 		* @param name : the name of the OpenGL function
 		* @return a pointer to the OpenGL function, or NULL if the function is not found
 		*/
-		static inline void* glGetProcAddress(const char* name);
+		static void* glGetProcAddress(const char* name);
 		
 		///////////////////
 		// Point Sprites //
@@ -213,14 +213,14 @@
 		*
 		* Note that before calling this method, the user must ensure that the point sprite extension is loaded.
 		*/
-		inline static void enablePointSpriteGLExt();
+		static void enablePointSpriteGLExt();
 
 		/** 
 		* @brief Disables the use of point sprites 
 		*
 		* Note that before calling this method, the user must ensure that the point sprite extension is loaded.
 		*/
-		inline static void disablePointSpriteGLExt();
+		static void disablePointSpriteGLExt();
 
 		//////////////////////
 		// Point Parameters //
@@ -356,11 +356,11 @@
 	inline void* GLExtHandler::glGetProcAddress(const char* name)
 	{
 #if defined(WIN32) || defined(_WIN32)
-		return (void*)wglGetProcAddress(name);			// Windows
+		return (void*)wglGetProcAddress(name);										// Windows
 #elif defined(__APPLE__) || defined(macintosh)
-		return (void*)SPK_NSGLGetProcAddress(name);		// MAC
+		return (void*)SPK_NSGLGetProcAddress(name);									// MAC
 #elif defined(linux) || defined(__linux)
-		return (void*)glXGetProcAddressARB(reinterpret_cast<const GLubyte*>(name));		// Linux
+		return (void*)glXGetProcAddressARB(reinterpret_cast<const GLubyte*>(name));	// Linux
 #else
 		return (void*)NULL;
 #endif
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -69,7 +69,7 @@
 		* @return A new registered GLLineRenderer
 		* @since 1.04.00
 		*/
-		static inline GLLineRenderer* create(float length = 1.0f,float width = 1.0f);
+		static GLLineRenderer* create(float length = 1.0f,float width = 1.0f);
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -75,7 +75,7 @@
 		* @return A new registered GLLineTrailRenderer
 		* @since 1.04.00
 		*/
-		static inline GLLineTrailRenderer* create();
+		static GLLineTrailRenderer* create();
 
 		/////////////
 		// Setters //
@@ -89,7 +89,7 @@
 		*
 		* @param nbSamples : the number of samples to construct the trails
 		*/
-		inline void setNbSamples(size_t nbSamples);
+		void setNbSamples(size_t nbSamples);
 
 		/**
 		* @brief Sets the width of a trail
@@ -98,7 +98,7 @@
 		*
 		* @param width : the width of trails in pixels
 		*/
-		inline void setWidth(float width);
+		void setWidth(float width);
 
 		/**
 		* @brief Sets the duration of a sample
@@ -108,7 +108,7 @@
 		*
 		* @param duration : the duration of a sample
 		*/
-		inline void setDuration(float duration);
+		void setDuration(float duration);
 
 		/**
 		* @brief Sets the color components of degenerated lines
@@ -119,7 +119,7 @@
 		*/
 		void setDegeneratedLines(float r,float g,float b,float a);
 
-		virtual inline void enableBlending(bool blendingEnabled);
+		virtual void enableBlending(bool blendingEnabled);
 
 		/////////////
 		// Getters //
@@ -129,19 +129,19 @@
 		* @brief Gets the number of samples per trail
 		* @return the number of samples per trail
 		*/
-		inline size_t getNbSamples() const;
+		size_t getNbSamples() const;
 
 		/**
 		* @brief Gets the width of a trail
 		* @return the width of a trail (in pixels)
 		*/
-		inline float getWidth() const;
+		float getWidth() const;
 
 		/**
 		* @brief Gets the duration of a sample
 		* @return the duration of a sample
 		*/
-		inline float getDuration() const;
+		float getDuration() const;
 
 		///////////////
 		// Interface //
@@ -191,7 +191,7 @@
 		static const std::string COLOR_BUFFER_NAME;
 		static const std::string VALUE_BUFFER_NAME;
 
-		inline void init(const Particle& particle,float age) const;
+		void init(const Particle& particle,float age) const;
 	};
 
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLPointRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -78,7 +78,7 @@
 		* @return A new registered GLPointRenderer
 		* @since 1.04.00
 		*/
-		static inline GLPointRenderer* create(float size = 1.0f);
+		static GLPointRenderer* create(float size = 1.0f);
 
 		/////////////
 		// Setters //
@@ -93,7 +93,7 @@
 		*
 		* @param textureIndex : the index of the openGL texture of this GLPointRenderer
 		*/
-		inline void setTexture(GLuint textureIndex);
+		void setTexture(GLuint textureIndex);
 
 		/**
 		* @brief Sets the way size of points is computed in this GLPointRenderer
@@ -116,13 +116,13 @@
 		* @brief Gets the texture of this GLPointRenderer
 		* @return the texture of this GLPointRenderer
 		*/
-		inline GLuint getTexture() const;
+		GLuint getTexture() const;
 
 		/**
 		* @brief Tells whether world size is enabled or not in this GLPointRenderer
 		* @return true if world size is enabled, false if not
 		*/
-		inline bool isWorldSizeEnabled() const;
+		bool isWorldSizeEnabled() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLQuadRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -80,7 +80,7 @@
 		* @return A new registered GLQuadRenderer
 		* @since 1.04.00
 		*/
-		static inline GLQuadRenderer* create(float scaleX = 1.0f,float scaleY = 1.0f);
+		static GLQuadRenderer* create(float scaleX = 1.0f,float scaleY = 1.0f);
 
 		/////////////
 		// Setters //
@@ -88,7 +88,7 @@
 
 		virtual bool setTexturingMode(TexturingMode mode);
 
-		inline void setTexture(GLuint textureIndex);
+		void setTexture(GLuint textureIndex);
 
 		/////////////
 		// Getters //
@@ -98,7 +98,7 @@
 		* @brief Gets the texture of this GLQuadRenderer
 		* @return the texture of this GLQuadRenderer
 		*/
-		inline GLuint getTexture() const;
+		GLuint getTexture() const;
 
 		///////////////
 		// Interface //
@@ -132,11 +132,11 @@
 
 		float* createTextureBuffer(const Group& group) const;
 
-		inline void invertModelView() const;
+		void invertModelView() const;
 
-		inline void GLCallColorAndVertex(const Particle& particle) const;	// OpenGL calls for color and position
-		inline void GLCallTexture2DAtlas(const Particle& particle) const;	// OpenGL calls for 2D atlastexturing 
-		inline void GLCallTexture3D(const Particle& particle) const;		// OpenGL calls for 3D texturing
+		void GLCallColorAndVertex(const Particle& particle) const;	// OpenGL calls for color and position
+		void GLCallTexture2DAtlas(const Particle& particle) const;	// OpenGL calls for 2D atlastexturing 
+		void GLCallTexture3D(const Particle& particle) const;		// OpenGL calls for 3D texturing
 
 		static void (GLQuadRenderer::*renderParticle)(const Particle&)  const;	// pointer to the right render method
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GLRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -60,7 +60,7 @@
 		* @brief Enables or disables the blending of this GLRenderer
 		* @param blendingEnabled true to enable the blending, false to disable it
 		*/
-		virtual inline void enableBlending(bool blendingEnabled);
+		virtual void enableBlending(bool blendingEnabled);
 
 		/**
 		* @brief Sets the blending functions of this GLRenderer
@@ -70,7 +70,7 @@
 		* @param src : the source blending function of this GLRenderer
 		* @param dest : the destination blending function of this GLRenderer
 		*/
-		inline void setBlendingFunctions(GLuint src,GLuint dest);
+		void setBlendingFunctions(GLuint src,GLuint dest);
 		virtual void setBlending(BlendingMode blendMode);
 
 		/**
@@ -80,7 +80,7 @@
 		*
 		* @param textureBlending : the texture blending function of this GLRenderer
 		*/
-		inline void setTextureBlending(GLuint textureBlending);
+		void setTextureBlending(GLuint textureBlending);
 
 		/////////////
 		// Getters //
@@ -90,25 +90,25 @@
 		* @brief Tells whether blending is enabled for this GLRenderer
 		* @return true if blending is enabled, false if it is disabled
 		*/
-		inline bool isBlendingEnabled() const;
+		bool isBlendingEnabled() const;
 
 		/**
 		* @brief Gets the source blending function of this GLRenderer
 		* @return the source blending function of this GLRenderer
 		*/
-		inline GLuint getSrcBlendingFunction() const;
+		GLuint getSrcBlendingFunction() const;
 
 		/**
 		* @brief Gets the destination blending function of this GLRenderer
 		* @return the source destination function of this GLRenderer
 		*/
-		inline GLuint getDestBlendingFunction() const;
+		GLuint getDestBlendingFunction() const;
 
 		/**
 		* @brief Gets the texture blending function of this GLRenderer
 		* @return the texture blending function of this GLRenderer
 		*/
-		inline GLuint getTextureBlending() const;
+		GLuint getTextureBlending() const;
 
 		///////////////
 		// Interface //
@@ -135,13 +135,13 @@
 	protected :
 
 		/** @brief Inits the blending of this GLRenderer */
-		inline void initBlending() const;
+		void initBlending() const;
 
 		/**
 		* @brief Inits the rendering hints of this GLRenderer
 		* @since 1.04.00
 		*/
-		inline void initRenderingHints() const;
+		void initRenderingHints() const;
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/OpenGL/SPK_GL_DEF.h	2013-05-01 13:12:52.000000000 +0000
@@ -55,6 +55,7 @@
 #endif
 
 #if defined(linux) || defined(__linux)
+#define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLDrawableRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -90,7 +90,7 @@
 		* @return A new registered SFMLDrawableRenderer
 		* @since 1.04.00
 		*/
-		static inline SFMLDrawableRenderer* create(sf::Drawable* drawable = NULL,float scaleX = 1.0f,float scaleY = 1.0f);
+		static SFMLDrawableRenderer* create(sf::Drawable* drawable = NULL,float scaleX = 1.0f,float scaleY = 1.0f);
 
 		/////////////
 		// Setters //
@@ -100,14 +100,14 @@
 		* @brief Sets the base Drawable of this SFMLDrawableRenderer
 		* @param drawable : the base Drawable of this SFMLDrawableRenderer
 		*/
-		inline void setDrawable(sf::Drawable* drawable);
+		void setDrawable(sf::Drawable* drawable);
 
 		/**
 		* @brief Sets the scale of this SFMLDrawableRenderer
 		* @param scaleX : the scale in X axis of this SFMLDrawableRenderer
 		* @param scaleY : the scale in X axis of this SFMLDrawableRenderer
 		*/
-		inline void setScale(float scaleX,float scaleY);
+		void setScale(float scaleX,float scaleY);
 
 		/////////////
 		// Getters //
@@ -117,19 +117,19 @@
 		* @brief Gets the base Drawable of this SFMLDrawableRenderer
 		* @return the base Drawable of this SFMLDrawableRenderer or NULL if no Drawable is set
 		*/
-		inline sf::Drawable* getDrawable() const;
+		sf::Drawable* getDrawable() const;
 
 		/**
 		* @brief Gets the scale in X axis of this SFMLDrawableRenderer
 		* @return the scale in X axis of this SFMLDrawableRenderer
 		*/
-		inline float getScaleX() const;
+		float getScaleX() const;
 
 		/**
 		* @brief Gets the scale in Y axis of this SFMLDrawableRenderer
 		* @return the scale in Y axis of this SFMLDrawableRenderer
 		*/
-		inline float getScaleY() const;
+		float getScaleY() const;
 
 	private :
 
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLLineRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -75,7 +75,7 @@
 		* @return A new registered SFMLLineRenderer
 		* @since 1.04.00
 		*/
-		static inline SFMLLineRenderer* create(float length = 1.0f,float width = 1.0f,ResizeMode mode = RESIZE_NONE);
+		static SFMLLineRenderer* create(float length = 1.0f,float width = 1.0f,ResizeMode mode = RESIZE_NONE);
 
 		/////////////
 		// Setters //
@@ -85,7 +85,7 @@
 		* @brief Sets the resize mode of this SFMLLineRenderer
 		* @param mode : the resize mode of this SFMLLineRenderer
 		*/
-		inline void setResizeMode(ResizeMode mode);
+		void setResizeMode(ResizeMode mode);
 
 		/////////////
 		// Getters //
@@ -95,7 +95,7 @@
 		* @brief Gets the resize mode of this SFMLLineRenderer
 		* @return the resize mode of this SFMLLineRenderer
 		*/
-		inline ResizeMode getResizeMode() const;
+		ResizeMode getResizeMode() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLPointRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -85,7 +85,7 @@
 		* @return A new registered SFMLPointRenderer
 		* @since 1.04.00
 		*/
-		static inline SFMLPointRenderer* create(float size = 1.0f,ResizeMode mode = RESIZE_NONE);
+		static SFMLPointRenderer* create(float size = 1.0f,ResizeMode mode = RESIZE_NONE);
 
 		/////////////
 		// Setters //
@@ -100,13 +100,13 @@
 		*
 		* @param image : the index of the SFML Image of this SFMLPointRenderer
 		*/
-		inline void setImage(sf::Image* image);
+		void setImage(sf::Image* image);
 
 		/**
 		* @brief Sets the resize mode of this SFMLPointRenderer
 		* @param mode : the resize mode of this SFMLPointRenderer
 		*/
-		inline void setResizeMode(ResizeMode mode);
+		void setResizeMode(ResizeMode mode);
 
 		/////////////
 		// Getters //
@@ -116,13 +116,13 @@
 		* @brief Gets the texture of this SFMLPointRenderer
 		* @return the texture of this SFMLPointRenderer
 		*/
-		inline sf::Image* getImage() const;
+		sf::Image* getImage() const;
 
 		/**
 		* @brief Gets the resize mode of this SFMLPointRenderer
 		* @return the resize mode of this SFMLPointRenderer
 		*/
-		inline ResizeMode getResizeMode() const;
+		ResizeMode getResizeMode() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLQuadRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -84,7 +84,7 @@
 		* @return A new registered SFMLQuadRenderer
 		* @since 1.04.00
 		*/
-		static inline SFMLQuadRenderer* create(sf::Image* image = NULL,float scaleX = 1.0f,float scaleY = 1.0f);
+		static SFMLQuadRenderer* create(sf::Image* image = NULL,float scaleX = 1.0f,float scaleY = 1.0f);
 
 		/////////////
 		// Setters //
@@ -94,9 +94,9 @@
 		* @brief Sets the image of this SFMLQuadRenderer
 		* @param image : the image of this SFMLQuadRenderer or NULL not to set an image
 		*/
-		inline void setImage(sf::Image* image);
+		void setImage(sf::Image* image);
 
-		virtual inline bool setTexturingMode(TexturingMode mode);
+		virtual bool setTexturingMode(TexturingMode mode);
 
 		/////////////
 		// Getters //
@@ -106,7 +106,7 @@
 		* @brief Gets the image of this SFMLQuadRenderer
 		* @return the image of this SFMLQuadRenderer or NULL if no image is set
 		*/
-		inline sf::Image* getImage() const;
+		sf::Image* getImage() const;
 
 		///////////////
 		// Interface //
@@ -137,8 +137,8 @@
 
 		void innerRender(const Group& group);
 
-		inline void GLCallColorAndVertex(const Particle& particle) const;	// OpenGL calls for color and position
-		inline void GLCallTexture2DAtlas(const Particle& particle) const;	// OpenGL calls for 2D atlastexturing 
+		void GLCallColorAndVertex(const Particle& particle) const;	// OpenGL calls for color and position
+		void GLCallTexture2DAtlas(const Particle& particle) const;	// OpenGL calls for 2D atlastexturing 
 
 		static void (SFMLQuadRenderer::*renderParticle)(const Particle&)  const;	// pointer to the right render method
 		
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLRenderer.h	2013-05-01 13:12:52.000000000 +0000
@@ -90,7 +90,7 @@
 		* @brief Sets the blend mode of this SFMLRenderer
 		* @param mode : the blend mode of this SFMLRenderer in SFML style
 		*/
-		inline void setBlendMode(sf::Blend::Mode mode);
+		void setBlendMode(sf::Blend::Mode mode);
 		virtual void setBlending(BlendingMode blendMode);
 
 		/**
@@ -102,7 +102,7 @@
 		* @param cull : true to enable the ground culling, false to disable it
 		* @since 1.03.00
 		*/
-		inline void setGroundCulling(bool cull);
+		void setGroundCulling(bool cull);
 
 		/////////////
 		// Getters //
@@ -112,7 +112,7 @@
 		* @brief Gets the blend mode of this SFMLRenderer
 		* @return the blend mode of this SFMLRenderer in SFML style
 		*/
-		inline sf::Blend::Mode getBlendMode() const;
+		sf::Blend::Mode getBlendMode() const;
 
 		/**
 		* @brief Tells whether the ground culling is enabled or not
@@ -122,7 +122,7 @@
 		* @return true if the ground culling is enabled, false if it is disabled
 		* @since 1.03.00
 		*/
-		inline bool hasGroundCulling() const;
+		bool hasGroundCulling() const;
 
 		///////////////
 		// Interface //
@@ -179,8 +179,9 @@
 		*
 		* @param system : The SFMLSystem that is currently being rendered
 		* @since 1.03.01
+		* @deprecated 1.05.05 Does nothing
 		*/
-		static void bindCurrentSystem(const SFMLSystem& system);
+		static void bindCurrentSystem(const SFMLSystem& system) {}
 
 		/**
 		* @brief Releases the current SFMLSystem
@@ -188,8 +189,9 @@
 		* This method sets internally the SFMLSystem being rendered to NULL
 		*
 		* @since 1.03.01
+		* @deprecated 1.05.05 Does nothing
 		*/
-		static void releaseCurrentSystem();
+		static void releaseCurrentSystem() {}
 
 	protected :
 
@@ -211,15 +213,12 @@
 		static float zFactor;
 
 		static sf::RenderTarget* currentTarget;
-		static const SFMLSystem* currentSystem;
 		
 		sf::Blend::Mode blendMode;
 
 		bool groundCulling;
 
-		inline void initBlending() const;
-		inline void initTransformation() const;
-		inline void finishTransformation() const;
+		void initBlending() const;
 
 		/**
 		* @brief Calls the rendering of a child of SFMLRenderer
@@ -277,18 +276,6 @@
 			}
 		}
 	}
-
-	inline void SFMLRenderer::initTransformation() const
-	{
-		if ((currentSystem != NULL)&&(currentSystem->isWorldTransformed()))
-			glPopMatrix();
-	}
-
-	inline void SFMLRenderer::finishTransformation() const
-	{
-		if ((currentSystem != NULL)&&(currentSystem->isWorldTransformed()))
-			glPushMatrix();
-	}
 }}
 
 #endif
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLSystem.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLSystem.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLSystem.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFMLSystem.h	2013-05-01 13:12:52.000000000 +0000
@@ -82,7 +82,7 @@
 		* @return A new registered SFMLSystem
 		* @since 1.04.00
 		*/
-		static inline SFMLSystem* create(bool worldTransformed = true,sf::RenderTarget* renderTarget = NULL);
+		static SFMLSystem* create(bool worldTransformed = true,sf::RenderTarget* renderTarget = NULL);
 
 		/////////////
 		// Setters //
@@ -95,7 +95,7 @@
 		*
 		* @param target : the RenderTarget of this SFMLSystem
 		*/
-		inline void setRenderTarget(sf::RenderTarget* target);
+		void setRenderTarget(sf::RenderTarget* target);
 		
 		/////////////
 		// Getters //
@@ -105,7 +105,7 @@
 		* @brief Gets the RenderTarget of this SFMLSystem
 		* @return the RenderTarget of this SFMLSystem or NULL if no RenderTarget is set
 		*/
-		inline sf::RenderTarget* getRenderTarget() const;
+		sf::RenderTarget* getRenderTarget() const;
 
 		/**
 		* @brief Tells whether this system is world transformed or not
@@ -118,7 +118,7 @@
 		* @return true if this system is world transformed, false if not
 		* @since 1.03.01
 		*/
-		inline bool isWorldTransformed() const;
+		bool isWorldTransformed() const;
 
 		///////////////
 		// Interface //
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFML_DEF.h maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFML_DEF.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFML_DEF.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/RenderingAPIs/SFML/SPK_SFML_DEF.h	2013-05-01 13:12:52.000000000 +0000
@@ -43,11 +43,10 @@
 #include "RenderingAPIs/OpenGL/SPK_GL_DEF.h"
 
 #ifndef SPK_NO_SFML_INC
-	// None is already defined in Xlib.h => We need to undef it !
-	// cf: http://www.sfml-dev.org/forum-fr/viewtopic.php?t=131&view=previous&sid=fa3712f60320d1a353924fd3a76bd769
-	#if defined None
-		#undef None	
-	#endif
+// None is already defined in Xlib.h => We need to undef it !
+#ifdef None
+#undef None   
+#endif
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
 #endif
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/include/SPK.h maxishoot2-1.0.2+oneiric1/src/spark/include/SPK.h
--- maxishoot2-1.0.1+oneiric1/src/spark/include/SPK.h	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/include/SPK.h	2013-05-01 13:12:52.000000000 +0000
@@ -52,6 +52,7 @@
 #include "Extensions/Zones/SPK_Plane.h"
 #include "Extensions/Zones/SPK_Line.h" // 1.01
 #include "Extensions/Zones/SPK_Ring.h" // 1.05
+#include "Extensions/Zones/SPK_Cylinder.h"
 
 // Emitters
 #include "Extensions/Emitters/SPK_StraightEmitter.h"
@@ -74,5 +75,6 @@
 #include "Extensions/Renderers/SPK_PointRendererInterface.h" // 1.04
 #include "Extensions/Renderers/SPK_LineRendererInterface.h" // 1.04
 #include "Extensions/Renderers/SPK_Oriented3DRendererInterface.h" // 1.04
+#include "Extensions/Renderers/SPK_QuadRendererInterface.h"
 
 #endif
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Emitter.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Emitter.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Emitter.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Emitter.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -45,8 +45,9 @@
 		registerChild(zone,registerAll);
 	}
 
-	void Emitter::copyChildren(const Emitter& emitter,bool createBase)
+	void Emitter::copyChildren(const Registerable& object,bool createBase)
 	{
+		const Emitter& emitter = dynamic_cast<const Emitter&>(object);
 		Registerable::copyChildren(emitter,createBase);
 		zone = dynamic_cast<Zone*>(copyChild(emitter.zone,createBase));	
 	}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Group.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Group.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Group.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Group.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -84,9 +84,9 @@
 		particleCurrentParams = new float[pool.getNbReserved() * model->getSizeOfParticleCurrentArray()];
 		particleExtendedParams = new float[pool.getNbReserved() * model->getSizeOfParticleExtendedArray()];
 
-		memcpy(particleData,group.particleData,pool.getNbTotal() * sizeof(Particle::ParticleData));
-		memcpy(particleCurrentParams,group.particleCurrentParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleCurrentArray());
-		memcpy(particleExtendedParams,group.particleExtendedParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleExtendedArray());
+		std::memcpy(particleData,group.particleData,pool.getNbTotal() * sizeof(Particle::ParticleData));
+		std::memcpy(particleCurrentParams,group.particleCurrentParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleCurrentArray());
+		std::memcpy(particleExtendedParams,group.particleExtendedParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleExtendedArray());
 
 		for (Pool<Particle>::iterator it = pool.begin(); it != pool.endInactive(); ++it)
 		{
@@ -120,8 +120,9 @@
 			registerChild(*it,registerAll);
 	}
 
-	void Group::copyChildren(const Group& group,bool createBase)
+	void Group::copyChildren(const Registerable& object,bool createBase)
 	{
+		const Group& group = dynamic_cast<const Group&>(object);
 		Registerable::copyChildren(group,createBase);
 
 		model = dynamic_cast<Model*>(copyChild(group.model,createBase));
@@ -577,9 +578,9 @@
 			float* newCurrentParams = new float[pool.getNbReserved() * model->getSizeOfParticleCurrentArray()];
 			float* newExtendedParams = new float[pool.getNbReserved() * model->getSizeOfParticleExtendedArray()];
 
-			memcpy(newData,particleData,pool.getNbTotal() * sizeof(Particle::ParticleData));
-			memcpy(newCurrentParams,particleCurrentParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleCurrentArray());
-			memcpy(newExtendedParams,particleExtendedParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleExtendedArray());
+			std::memcpy(newData,particleData,pool.getNbTotal() * sizeof(Particle::ParticleData));
+			std::memcpy(newCurrentParams,particleCurrentParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleCurrentArray());
+			std::memcpy(newExtendedParams,particleExtendedParams,pool.getNbTotal() * sizeof(float) * model->getSizeOfParticleExtendedArray());
 
 			delete[] particleData;
 			delete[] particleCurrentParams;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Interpolator.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Interpolator.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Interpolator.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Interpolator.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -83,11 +83,13 @@
 			}
 
 			// Else finds the current X in the range
-			float newX = (currentKey.x - graph.begin()->x) / (graph.rbegin()->x - graph.begin()->x);
+			const float beginX = graph.begin()->x;
+			const float rangeX = graph.rbegin()->x - beginX;
+			float newX = (currentKey.x - beginX) / rangeX;
 			newX -= static_cast<int>(newX);
 			if (newX < 0.0f)
 				newX = 1.0f + newX;
-			currentKey.x = graph.begin()->x + newX * (graph.rbegin()->x - graph.begin()->x);
+			currentKey.x = beginX + newX * rangeX;
 		}
 
 		// Gets the entry that is immediatly after the current X
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Modifier.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Modifier.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Modifier.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Modifier.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -46,8 +46,9 @@
 		registerChild(zone,registerAll);
 	}
 
-	void Modifier::copyChildren(const Modifier& modifier,bool createBase)
+	void Modifier::copyChildren(const Registerable& object,bool createBase)
 	{
+		const Modifier& modifier = dynamic_cast<const Modifier&>(object);
 		Registerable::copyChildren(modifier,createBase);
 		zone = dynamic_cast<Zone*>(copyChild(modifier.zone,createBase));
 	}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_System.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_System.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_System.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_System.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -57,8 +57,9 @@
 			registerChild(*it,registerAll);
 	}
 
-	void System::copyChildren(const System& system,bool createBase)
+	void System::copyChildren(const Registerable& object,bool createBase)
 	{
+		const System& system = dynamic_cast<const System&>(object);
 		Registerable::copyChildren(system,createBase);
 
 		// we clear the copies of pointers pushed in the vectors by the copy constructor
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Transformable.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Transformable.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Core/SPK_Transformable.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Core/SPK_Transformable.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -40,8 +40,8 @@
 		parent(NULL),
 		localIdentity(true)
 	{
-		memcpy(local,IDENTITY,sizeof(float) * TRANSFORM_LENGTH);
-		memcpy(world,IDENTITY,sizeof(float) * TRANSFORM_LENGTH);
+		std::memcpy(local,IDENTITY,sizeof(float) * TRANSFORM_LENGTH);
+		std::memcpy(world,IDENTITY,sizeof(float) * TRANSFORM_LENGTH);
 	}
 
 	Transformable::Transformable(const Transformable& transformable) :
@@ -51,8 +51,8 @@
 		parent(NULL),
 		localIdentity(transformable.localIdentity)
 	{
-		memcpy(local,transformable.local,sizeof(float) * TRANSFORM_LENGTH);
-		memcpy(world,transformable.world,sizeof(float) * TRANSFORM_LENGTH);
+		std::memcpy(local,transformable.local,sizeof(float) * TRANSFORM_LENGTH);
+		std::memcpy(world,transformable.world,sizeof(float) * TRANSFORM_LENGTH);
 	}
 
 	void Transformable::setTransformNC(const float* transform)
@@ -207,10 +207,10 @@
 			(parent != NULL && lastParentUpdate != parent->currentUpdate))	// the parent transform has been modified
 		{
 			if (parent == NULL)
-				memcpy(world,local,sizeof(float) * TRANSFORM_LENGTH);
+				std::memcpy(world,local,sizeof(float) * TRANSFORM_LENGTH);
 			else if (isLocalIdentity())
 			{
-				memcpy(world,parent->world,sizeof(float) * TRANSFORM_LENGTH);
+				std::memcpy(world,parent->world,sizeof(float) * TRANSFORM_LENGTH);
 				lastParentUpdate = parent->lastUpdate;
 			}
 			else
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Emitters/SPK_NormalEmitter.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Emitters/SPK_NormalEmitter.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Emitters/SPK_NormalEmitter.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Emitters/SPK_NormalEmitter.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -37,8 +37,9 @@
 		registerChild(normalZone,registerAll);
 	}
 
-	void NormalEmitter::copyChildren(const NormalEmitter& emitter,bool createBase)
+	void NormalEmitter::copyChildren(const Registerable& object,bool createBase)
 	{
+		const NormalEmitter& emitter = dynamic_cast<const NormalEmitter&>(object);
 		Emitter::copyChildren(emitter,createBase);
 		normalZone = dynamic_cast<Zone*>(copyChild(emitter.normalZone,createBase));	
 	}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Emitters/SPK_SphericEmitter.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Emitters/SPK_SphericEmitter.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Emitters/SPK_SphericEmitter.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Emitters/SPK_SphericEmitter.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -53,8 +53,8 @@
 		angleMin = angleA;
 		angleMax = angleB;
 
-		cosAngleMin = cos(angleMin * 0.5f);
-		cosAngleMax = cos(angleMax * 0.5f);
+		cosAngleMin = std::cos(angleMin * 0.5f);
+		cosAngleMax = std::cos(angleMax * 0.5f);
 	}
 
 	void SphericEmitter::computeMatrix()
@@ -101,13 +101,13 @@
 	void SphericEmitter::generateVelocity(Particle& particle,float speed) const
 	{
 		float a = random(cosAngleMax,cosAngleMin);
-		float theta = acos(a);
+		float theta = std::acos(a);
 		float phi = random(0.0f,2.0f * PI);
 
-		float sinTheta = sin(theta);
-		float x = sinTheta * cos(phi);
-		float y = sinTheta * sin(phi);
-		float z = cos(theta);
+		float sinTheta = std::sin(theta);
+		float x = sinTheta * std::cos(phi);
+		float y = sinTheta * std::sin(phi);
+		float z = std::cos(theta);
 
 		particle.velocity().x = speed * (matrix[0] * x + matrix[1] * y + matrix[2] * z);
 		particle.velocity().y = speed * (matrix[3] * x + matrix[4] * y + matrix[5] * z);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Modifiers/SPK_Destroyer.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Modifiers/SPK_Destroyer.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Modifiers/SPK_Destroyer.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Modifiers/SPK_Destroyer.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -27,7 +27,7 @@
 
 namespace SPK
 {
-	Destroyer::Destroyer(Zone* zone,ModifierTrigger) :
+	Destroyer::Destroyer(Zone* zone,ModifierTrigger trigger) :
 		Modifier(INSIDE_ZONE | OUTSIDE_ZONE | INTERSECT_ZONE | ENTER_ZONE | EXIT_ZONE,INSIDE_ZONE,true,false,zone)
 	{
 		setTrigger(trigger);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Modifiers/SPK_ModifierGroup.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Modifiers/SPK_ModifierGroup.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Modifiers/SPK_ModifierGroup.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Modifiers/SPK_ModifierGroup.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -39,8 +39,9 @@
 			registerChild(*it,registerAll);	
 	}
 
-	void ModifierGroup::copyChildren(const ModifierGroup& modifier,bool createBase)
+	void ModifierGroup::copyChildren(const Registerable& object,bool createBase)
 	{
+		const ModifierGroup& modifier = dynamic_cast<const ModifierGroup&>(object);
 		Modifier::copyChildren(modifier,createBase);
 
 		// we clear the copies of pointers pushed in the vectors by the copy constructor
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_AABox.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_AABox.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_AABox.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_AABox.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -77,7 +77,7 @@
 		float tEnter = 0.0f;
 		float tExit = 1.0f;
 
-		int axis;
+		int axis = 0;
 
 		if (!slabIntersects(v0.x,v1.x,getTransformedPosition().x - dimension.x * 0.5f,getTransformedPosition().x + dimension.x * 0.5f,tEnter,tExit,axis,0))
 			return false;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_Cylinder.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_Cylinder.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_Cylinder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_Cylinder.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -0,0 +1,172 @@
+//////////////////////////////////////////////////////////////////////////////////
+// SPARK particle engine														//
+// Copyright (C) 2008-2010                                                      //
+//  - Julien Fryer - julienfryer@gmail.com				                        //
+//  - Thibault Lescoat -  info-tibo <at> orange <dot> fr						//
+//																				//
+// This software is provided 'as-is', without any express or implied			//
+// warranty.  In no event will the authors be held liable for any damages		//
+// arising from the use of this software.										//
+//																				//
+// Permission is granted to anyone to use this software for any purpose,		//
+// including commercial applications, and to alter it and redistribute it		//
+// freely, subject to the following restrictions:								//
+//																				//
+// 1. The origin of this software must not be misrepresented; you must not		//
+//    claim that you wrote the original software. If you use this software		//
+//    in a product, an acknowledgment in the product documentation would be		//
+//    appreciated but is not required.											//
+// 2. Altered source versions must be plainly marked as such, and must not be	//
+//    misrepresented as being the original software.							//
+// 3. This notice may not be removed or altered from any source distribution.	//
+//////////////////////////////////////////////////////////////////////////////////
+
+#include "Extensions/Zones/SPK_Cylinder.h"
+#include "Core/SPK_Particle.h"
+
+namespace SPK
+{
+	Cylinder::Cylinder(const Vector3D& position,const Vector3D& direction,float radius,float length) :
+		Zone(position)
+	{
+		setDirection(direction);
+		setRadius(radius);
+		setLength(length);
+	}
+
+    bool Cylinder::contains(const Vector3D& v) const
+    {
+        float dist = dotProduct(tDirection,v - getTransformedPosition());
+
+		Vector3D ext = v - (tDirection*dist + getTransformedPosition());
+		float r = ext.getNorm();
+
+		return dist <= length*0.5f && dist >= -length*0.5f && r <= radius;
+    }
+    Vector3D Cylinder::computeNormal(const Vector3D& point) const
+    {
+        float dist = dotProduct(tDirection,point - getTransformedPosition());
+        if(dist >= length*0.5f) return tDirection;
+		if(dist <= -length*0.5f) return -tDirection;
+
+		Vector3D ext = point - (tDirection*dist + getTransformedPosition());
+		float r = ext.getNorm(); ext = ext / r;
+
+		return ext;
+    }
+
+	void Cylinder::generatePosition(Particle& particle,bool full) const
+	{
+	    float cRadius = full ? random(0.0f,radius) : radius,
+            cLength = full ? random(0.0f,length)-length*0.5f : length,
+            cAngle = random(0.0f,3.15f); // 3.15 > PI, but it has no importance here...
+
+	    // We need at least two points to compute a base
+	    Vector3D rPoint = getTransformedPosition() + Vector3D(10.0f,10.0f,10.0f);
+	    float dist = dotProduct(tDirection,rPoint);
+	    while(dist == 0.0f || tDirection*dist +getTransformedPosition() == rPoint)
+	    {
+	        // avoid dist == 0, which leads to a div by zero.
+	        rPoint += Vector3D(10.0f,10.0f,random(-10.0f,10.0f));
+	        dist = dotProduct(tDirection,rPoint);
+	    }
+
+	    Vector3D p1 = tDirection*dist +getTransformedPosition();
+	    dist = getDist(p1,rPoint);
+
+	    Vector3D a = (rPoint - p1) / dist;
+		Vector3D tmp1 = tDirection, tmp2 = a; tmp2.crossProduct(tmp1*(-1));
+        Vector3D b = tmp2;
+
+        particle.position() = getTransformedPosition() + cLength * tDirection + a * cRadius * std::cos(cAngle) + b * cRadius * std::sin(cAngle);
+	}
+
+	bool Cylinder::intersects(const Vector3D& v0,const Vector3D& v1,Vector3D* intersection,Vector3D* normal) const
+	{
+	    if(!intersection) return false;
+
+	    // mindist between line directed by tDir and line(v0 v1).
+	    Vector3D u = v1 - v0; u.normalize();
+	    if(tDirection == u || tDirection == -u) // colinear
+	    {
+	        float dist = dotProduct(tDirection,v0 - getTransformedPosition());
+
+            Vector3D ext = v0 - (tDirection*dist + getTransformedPosition());
+            float r = ext.getNorm(); ext = ext / r;
+
+            if(r == radius) //intersection
+            {
+                *intersection = getTransformedPosition() + ext * radius;
+                if(normal)
+                    *normal = computeNormal(*intersection);
+                return true;
+            }
+            else if(r < radius)
+            {
+                *intersection = getTransformedPosition() + tDirection * length*0.5f + ext * r;
+                if(normal)
+                    *normal = computeNormal(*intersection);
+                return true;
+            }
+            return false;
+	    }
+	    else
+	    {
+	        Vector3D pp = getTransformedPosition() - v0, uv = u;
+	        uv.crossProduct(tDirection);
+			float dist = std::abs(dotProduct(pp,uv))/uv.getNorm();
+
+	        float d = dotProduct(tDirection,v0 - getTransformedPosition());
+            Vector3D ext = v0 - (tDirection*d + getTransformedPosition());
+            float r = ext.getNorm();
+
+	        float ah = std::cos(std::asin(dist/r))*r;
+	        Vector3D h = v0 + u*ah;
+
+	        if(contains(h)) // intersection
+	        {
+	            float offset = 3.1415926535897932384626433832795f*0.5f*dist/radius;
+	            *intersection = h - offset * u;
+	            if(normal)
+                    *normal = computeNormal(*intersection);
+	            return true;
+	        }
+	        return false;
+	    }
+	}
+
+	void Cylinder::moveAtBorder(Vector3D& v,bool inside) const
+	{
+	    float approx = inside ? -APPROXIMATION_VALUE : APPROXIMATION_VALUE;
+        float dist = dotProduct(tDirection,v - getTransformedPosition());
+
+		Vector3D ext = v - (tDirection*dist + getTransformedPosition());
+		float r = ext.getNorm(); ext = ext / r;
+		if(dist > length*0.5f)
+		{
+		    v -= tDirection * (dist - length*0.5f - approx);
+		    if(r > radius)
+                v -= ext*(r-radius-approx);
+            return;
+		}
+		else if(dist < -length * 0.5f)
+		{
+            v += tDirection * (length*0.5f - dist - approx);
+            if(r > radius)
+                v -= ext*(r-radius-approx);
+            return;
+        }
+
+        if(r > radius)
+            v -= ext*(r-radius-approx);
+        else
+            v += ext*(radius-r+approx);
+	}
+
+	void Cylinder::innerUpdateTransform()
+	{
+		Zone::innerUpdateTransform();
+		transformDir(tDirection,direction);
+		tDirection.normalize();
+	}
+}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_Ring.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_Ring.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/Extensions/Zones/SPK_Ring.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/Extensions/Zones/SPK_Ring.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -31,7 +31,7 @@
 		setRadius(minRadius,maxRadius);
 	}
 
-	inline void Ring::setRadius(float minRadius,float maxRadius)
+	void Ring::setRadius(float minRadius,float maxRadius)
 	{
 		if (minRadius < 0.0f) minRadius = -minRadius;
 		if (maxRadius < 0.0f) maxRadius = -maxRadius;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/Irrlicht/SPK_IRRBuffer.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -101,7 +101,7 @@
 				 return new IRRBuffer(device,nbParticles,particleVertexSize,particleIndexSize,irr::video::EIT_32BIT);
 
 			case EII_16BITS :
-				if(nbParticles > static_cast<size_t>(65535 / particleVertexSize))
+				if(nbParticles * particleVertexSize > 65536)
 				{
 					device->getLogger()->log(L"Unable to create particle buffer using 16bits indices : too many particles\n",irr::ELL_WARNING);
 					return NULL;
@@ -110,7 +110,7 @@
 					return new IRRBuffer(device,nbParticles,particleVertexSize,particleIndexSize,irr::video::EIT_16BIT);
 
 			case EII_AUTO :
-				if (nbParticles > static_cast<size_t>(65535 / particleVertexSize))
+				if (nbParticles * particleVertexSize > 65536)
 					return new IRRBuffer(device,nbParticles,particleVertexSize,particleIndexSize,irr::video::EIT_32BIT);
 				else
 					return new IRRBuffer(device,nbParticles,particleVertexSize,particleIndexSize,irr::video::EIT_16BIT);
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLExtHandler.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -260,7 +260,7 @@
 	void GLExtHandler::setPixelPerUnit(float fovy,int screenHeight)
 	{
 		// the pixel per unit is computed for a distance from the camera of screenHeight
-		pixelPerUnit = screenHeight / (2.0f * tan(fovy * 0.5f));
+		pixelPerUnit = screenHeight / (2.0f * std::tan(fovy * 0.5f));
 	}
 
 	void GLExtHandler::glTexImage3D(GLenum target,
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/OpenGL/SPK_GLLineTrailRenderer.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -150,12 +150,12 @@
 			{
 				if (age - *(valueIterator + 1) >= duration / (nbSamples - 1)) // shifts the data by one
 				{
-					memmove(vertexIterator + 6,vertexIterator + 3,(nbSamples - 1) * 3 * sizeof(float));
-					memmove(colorIterator + 8,colorIterator + 4,((nbSamples - 1) << 2) * sizeof(float));
-					memmove(valueIterator + 1,valueIterator,(nbSamples - 1) * sizeof(float));
+					std::memmove(vertexIterator + 6,vertexIterator + 3,(nbSamples - 1) * 3 * sizeof(float));
+					std::memmove(colorIterator + 8,colorIterator + 4,((nbSamples - 1) << 2) * sizeof(float));
+					std::memmove(valueIterator + 1,valueIterator,(nbSamples - 1) * sizeof(float));
 
 					// post degenerated vertex copy
-					memcpy(vertexIterator + (nbSamples + 1) * 3,vertexIterator + nbSamples * 3,3 * sizeof(float));
+					std::memcpy(vertexIterator + (nbSamples + 1) * 3,vertexIterator + nbSamples * 3,3 * sizeof(float));
 				}
 
 				// Updates the current sample
@@ -164,7 +164,7 @@
 				*(vertexIterator++) = pos.y;
 				*(vertexIterator++) = pos.z;
 
-				memcpy(vertexIterator,vertexIterator - 3,3 * sizeof(float));
+				std::memcpy(vertexIterator,vertexIterator - 3,3 * sizeof(float));
 				vertexIterator += (nbSamples + 1) * 3;
 
 				colorIterator += 4; // skips post degenerated vertex color
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLRenderer.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -30,7 +30,6 @@
 	float SFMLRenderer::zFactor = 0.0f;
 
 	sf::RenderTarget* SFMLRenderer::currentTarget = NULL;
-	const SFMLSystem* SFMLRenderer::currentSystem = NULL;
 
 	SFMLRenderer::SFMLRenderer() :
 		Renderer(),
@@ -64,7 +63,6 @@
 			return;
 
 		initBlending();
-		initTransformation();
 
 		if (isRenderingHintEnabled(ALPHA_TEST))
 		{
@@ -75,8 +73,6 @@
 			glDisable(GL_ALPHA_TEST);
 
 		innerRender(group);
-
-		finishTransformation();
 	}
 
 	void SFMLRenderer::setZFactor(float zFactor)
@@ -99,16 +95,6 @@
 		currentTarget = NULL;
 	}
 
-	void SFMLRenderer::bindCurrentSystem(const SFMLSystem& system)
-	{
-		currentSystem = &system;
-	}
-
-	void SFMLRenderer::releaseCurrentSystem()
-	{
-		currentSystem = NULL;
-	}
-
 	sf::RenderTarget* SFMLRenderer::getCurrentTarget()
 	{
 		return currentTarget;
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/RenderingAPIs/SFML/SPK_SFMLSystem.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -53,8 +53,13 @@
 	void SFMLSystem::Render(sf::RenderTarget& target) const
 	{
 		SFMLRenderer::bindCurrentTarget(target);
-		SFMLRenderer::bindCurrentSystem(*this);
+
+		if (isWorldTransformed())
+		{
+			glMatrixMode(GL_MODELVIEW);
+			glLoadIdentity();
+		}
+		
 		System::render();
-		SFMLRenderer::releaseCurrentSystem();
 	}
 }}
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/src/SPK_All.cpp maxishoot2-1.0.2+oneiric1/src/spark/src/SPK_All.cpp
--- maxishoot2-1.0.1+oneiric1/src/spark/src/SPK_All.cpp	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/src/SPK_All.cpp	2013-05-01 13:12:52.000000000 +0000
@@ -57,6 +57,7 @@
 #include "Extensions/Zones/SPK_Plane.cpp"
 #include "Extensions/Zones/SPK_Line.cpp" // 1.01
 #include "Extensions/Zones/SPK_Ring.cpp" // 1.05
+#include "Extensions/Zones/SPK_Cylinder.cpp"
 
 // Emitters
 #include "Extensions/Emitters/SPK_StraightEmitter.cpp"
diff -Nru maxishoot2-1.0.1+oneiric1/src/spark/version maxishoot2-1.0.2+oneiric1/src/spark/version
--- maxishoot2-1.0.1+oneiric1/src/spark/version	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/spark/version	2013-05-01 13:12:52.000000000 +0000
@@ -1 +1 @@
-1.05.04
+1.5.5
diff -Nru maxishoot2-1.0.1+oneiric1/src/ticpp/Makefile.in maxishoot2-1.0.2+oneiric1/src/ticpp/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/ticpp/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/ticpp/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,23 +16,6 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -94,11 +77,6 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libticpp_la_SOURCES)
 DIST_SOURCES = $(libticpp_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,8 +143,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff -Nru maxishoot2-1.0.1+oneiric1/src/win32/Makefile.in maxishoot2-1.0.2+oneiric1/src/win32/Makefile.in
--- maxishoot2-1.0.1+oneiric1/src/win32/Makefile.in	2012-12-03 07:21:24.000000000 +0000
+++ maxishoot2-1.0.2+oneiric1/src/win32/Makefile.in	2013-05-01 13:12:52.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,23 +15,6 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,11 +46,6 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -132,8 +110,8 @@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OGLWIN_CFLAGS = @OGLWIN_CFLAGS@
-OGLWIN_LIBS = @OGLWIN_LIBS@
+OGLMAC_CFLAGS = @OGLMAC_CFLAGS@
+OGLMAC_LIBS = @OGLMAC_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@