[Pingus-CVS] r3033 - in branches/pingus_sdl: . src

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-24 01:17:49 +0200 (Fri, 24 Aug 2007)
New Revision: 3033

Modified:
   branches/pingus_sdl/config.h
   branches/pingus_sdl/src/pingus.hpp
   branches/pingus_sdl/src/pingus_main.cpp
Log:
- removed a bunch of unneeded defines

Modified: branches/pingus_sdl/config.h
===================================================================
--- branches/pingus_sdl/config.h        2007-08-23 18:42:59 UTC (rev 3032)
+++ branches/pingus_sdl/config.h        2007-08-23 23:17:49 UTC (rev 3033)
@@ -1,69 +1,6 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#define HAVE_FNMATCH 1
-
-/* Define if you have the iconv() function. */
-#define HAVE_ICONV 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Has the clanMikMod library */
-#define HAVE_LIBCLANMIKMOD 1
-
-/* Has the clanVorbis library */
-#define HAVE_LIBCLANVORBIS 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the <sstream> header file. */
-#define HAVE_SSTREAM 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
 /* Define as const if the declaration of iconv() needs const. */
 #ifdef __CYGWIN__
 #define ICONV_CONST const
@@ -71,36 +8,5 @@
 #define ICONV_CONST
 #endif
 
-/* Name of package */
-#define PACKAGE "pingus"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Pingus"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Pingus 0.7.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "pingus"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.7.0"
-
-/* Location of Pingus data files */
-#define PINGUS_DATADIR "/usr/local/share/games/pingus"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
 /* Version number of package */
 #define VERSION "0.7.0"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */

Modified: branches/pingus_sdl/src/pingus.hpp
===================================================================
--- branches/pingus_sdl/src/pingus.hpp  2007-08-23 18:42:59 UTC (rev 3032)
+++ branches/pingus_sdl/src/pingus.hpp  2007-08-23 23:17:49 UTC (rev 3033)
@@ -44,10 +44,6 @@
 #  include <assert.h>
 #endif
 
-#if defined(WIN32) && defined(__GNUC__) && !defined(HAVE_SSTREAM)
-#  define HAVE_SSTREAM
-#endif
-
 #define UNUSED_ARG(a) do {/* null */} while (&a == 0)
 
 #endif

Modified: branches/pingus_sdl/src/pingus_main.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_main.cpp     2007-08-23 18:42:59 UTC (rev 
3032)
+++ branches/pingus_sdl/src/pingus_main.cpp     2007-08-23 23:17:49 UTC (rev 
3033)
@@ -153,7 +153,6 @@
   static char title[] = "Pingus "VERSION" (unofficial build) - 
http://pingus.seul.org";;
 #endif
   return title;
-  //return (string(PACKAGE) + " " + VERSION + " - 
http://pingus.seul.org";).c_str();
 }
 
 void
@@ -880,7 +879,7 @@
   }
   atexit(SDL_Quit); 
   Display::set_video_mode(screen_width, screen_height);
-  SDL_WM_SetCaption(PACKAGE_STRING " - SDL Edition", 0 /* icon */);
+  SDL_WM_SetCaption("Pingus - SDL Edition", 0 /* icon */);
   SDL_EnableUNICODE(1);
 }