From 82a761da8025c09c9eee2cf6753cc70c039046c0 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Wed, 17 Mar 2004 19:19:12 +0000 Subject: [PATCH] - renamed *.c to *.cxx SVN-Revision: 256 --- configure.ac | 32 +++++++++++---------- src/Makefile.am | 52 +++++++++++++++++----------------- src/{badguy.c => badguy.cpp} | 0 src/{bitmask.c => bitmask.cpp} | 0 src/{button.c => button.cpp} | 0 src/{collision.c => collision.cpp} | 0 src/{gameloop.c => gameloop.cpp} | 0 src/{globals.c => globals.cpp} | 0 src/{high_scores.c => high_scores.cpp} | 0 src/{intro.c => intro.cpp} | 0 src/{level.c => level.cpp} | 0 src/{leveleditor.c => leveleditor.cpp} | 0 src/{lispreader.c => lispreader.cpp} | 0 src/{menu.c => menu.cpp} | 0 src/{physic.c => physic.cpp} | 0 src/{player.c => player.cpp} | 0 src/{scene.c => scene.cpp} | 0 src/{screen.c => screen.cpp} | 0 src/{setup.c => setup.cpp} | 0 src/{sound.c => sound.cpp} | 0 src/{special.c => special.cpp} | 0 src/{supertux.c => supertux.cpp} | 0 src/{text.c => text.cpp} | 0 src/{texture.c => texture.cpp} | 0 src/{timer.c => timer.cpp} | 0 src/{title.c => title.cpp} | 0 src/{type.c => type.cpp} | 0 src/{world.c => world.cpp} | 0 28 files changed, 43 insertions(+), 41 deletions(-) rename src/{badguy.c => badguy.cpp} (100%) rename src/{bitmask.c => bitmask.cpp} (100%) rename src/{button.c => button.cpp} (100%) rename src/{collision.c => collision.cpp} (100%) rename src/{gameloop.c => gameloop.cpp} (100%) rename src/{globals.c => globals.cpp} (100%) rename src/{high_scores.c => high_scores.cpp} (100%) rename src/{intro.c => intro.cpp} (100%) rename src/{level.c => level.cpp} (100%) rename src/{leveleditor.c => leveleditor.cpp} (100%) rename src/{lispreader.c => lispreader.cpp} (100%) rename src/{menu.c => menu.cpp} (100%) rename src/{physic.c => physic.cpp} (100%) rename src/{player.c => player.cpp} (100%) rename src/{scene.c => scene.cpp} (100%) rename src/{screen.c => screen.cpp} (100%) rename src/{setup.c => setup.cpp} (100%) rename src/{sound.c => sound.cpp} (100%) rename src/{special.c => special.cpp} (100%) rename src/{supertux.c => supertux.cpp} (100%) rename src/{text.c => text.cpp} (100%) rename src/{texture.c => texture.cpp} (100%) rename src/{timer.c => timer.cpp} (100%) rename src/{title.c => title.cpp} (100%) rename src/{type.c => type.cpp} (100%) rename src/{world.c => world.cpp} (100%) diff --git a/configure.ac b/configure.ac index 90e0b5ef1..fac9c086b 100644 --- a/configure.ac +++ b/configure.ac @@ -7,16 +7,17 @@ dnl =========================================================================== dnl Process this file with autoconf to produce a configure script. -AC_INIT(SuperTux, 0.0.6-cvs) -AC_CONFIG_SRCDIR([src/supertux.c]) +AC_INIT(SuperTux, 0.0.7-cvs) +AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE SDL_VERSION=1.2.4 AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL -AC_LANG(C) +AC_LANG(C++) dnl Checks for header files. AC_HEADER_DIRENT @@ -33,7 +34,7 @@ AC_MSG_CHECKING(for gprof mode) AC_ARG_ENABLE(gprof, AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),, enable_gprof="no") if test "x${enable_gprof}" != "xno"; then - CFLAGS="$CFLAGS -pg" + CXXFLAGS="$CXXFLAGS -pg" AC_MSG_RESULT([enabled]) else AC_MSG_RESULT([disabled]) @@ -43,7 +44,7 @@ AC_MSG_CHECKING(for debug mode) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes") if test "x${enable_debug}" != "xno"; then - CFLAGS="$CFLAGS -DDEBUG" + CXXFLAGS="$CXXFLAGS -DDEBUG" AC_MSG_RESULT([enabled]) else AC_MSG_RESULT([disabled]) @@ -53,10 +54,10 @@ AC_MSG_CHECKING(weather OpenGL should be used) AC_ARG_ENABLE(opengl, AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),, enable_opengl="yes") if test "x${enable_opengl}" != "xno"; then - CFLAGS="$CFLAGS -D__OPENGL" + CXXFLAGS="$CXXFLAGS -D__OPENGL" AC_MSG_RESULT([yes]) else - CFLAGS="$CFLAGS -DNOOPENGL" + CXXFLAGS="$CXXFLAGS -DNOOPENGL" AC_MSG_RESULT([no]) fi @@ -64,26 +65,27 @@ AC_MSG_CHECKING(weather Sound should be supported) AC_ARG_ENABLE(sound, AC_HELP_STRING([--disable-sound], [disable sound support]),, enable_sound="yes") if test "x${enable_sound}" != "xno"; then - CFLAGS="$CFLAGS -D__SOUND" + CXXFLAGS="$CXXFLAGS -D__SOUND" AC_MSG_RESULT([yes]) else - CFLAGS="$CFLAGS -DNOSOUND" + CXXFLAGS="$CXXFLAGS -DNOSOUND" AC_MSG_RESULT([no]) fi dnl =========================================================================== dnl Check for SDL +AC_LANG_PUSH(C) AM_PATH_SDL($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) - -CFLAGS="$CFLAGS $SDL_CFLAGS" +CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LDFLAGS="$LDFLAGS $SDL_LIBS" +AC_LANG_POP() dnl Checks for additional libraries. if test "x${enable_sound}" != "xno"; then AC_CHECK_LIB(SDL_mixer, SDL_OpenAudio,, - [CFLAGS="$CFLAGS -DNOSOUND" + [CXXFLAGS="$CXXFLAGS -DNOSOUND" enable_sound="no"]) fi @@ -94,16 +96,16 @@ if test "x${enable_opengl}" != "xno"; then # else I end up with a black screen, might be a debian issue or a # local issue on my system, not sure AC_PATH_XTRA - CFLAGS="$CFLAGS $X_CFLAGS" + CXXFLAGS="$CXXFLAGS $X_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" AC_CHECK_LIB(GL, glBegin,, - [CFLAGS="$CFLAGS -DNOOPENGL" + [CXXFLAGS="$CXXFLAGS -DNOOPENGL" enable_opengl="no"]) fi # FIXME: Evil -CFLAGS="$CFLAGS -DDATA_PREFIX='\"$datadir/supertux/\"' -DLINUX" +CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux/\"' -DLINUX" dnl Checks for library functions. AC_CHECK_FUNCS(mkdir strdup strstr) diff --git a/src/Makefile.am b/src/Makefile.am index c0986a83b..41c9f34a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,58 +1,58 @@ bin_PROGRAMS = supertux supertux_SOURCES = \ - badguy.c \ + badguy.cpp \ badguy.h \ - bitmask.c \ + bitmask.cpp \ bitmask.h \ - button.c \ + button.cpp \ button.h \ - collision.c \ + collision.cpp \ collision.h \ defines.h \ - gameloop.c \ + gameloop.cpp \ gameloop.h \ - globals.c \ + globals.cpp \ globals.h \ - high_scores.c \ + high_scores.cpp \ high_scores.h \ - intro.c \ + intro.cpp \ intro.h \ - level.c \ + level.cpp \ level.h \ - leveleditor.c \ + leveleditor.cpp \ leveleditor.h \ - lispreader.c \ + lispreader.cpp \ lispreader.h \ - menu.c \ + menu.cpp \ menu.h \ - physic.c \ + physic.cpp \ physic.h \ - player.c \ + player.cpp \ player.h \ - scene.c \ + scene.cpp \ scene.h \ - screen.c \ + screen.cpp \ screen.h \ - setup.c \ + setup.cpp \ setup.h \ - sound.c \ + sound.cpp \ sound.h \ - special.c \ + special.cpp \ special.h \ - supertux.c \ + supertux.cpp \ supertux.h \ - text.c \ + text.cpp \ text.h \ - texture.c \ + texture.cpp \ texture.h \ - timer.c \ + timer.cpp \ timer.h \ - title.c \ + title.cpp \ title.h \ - type.c \ + type.cpp \ type.h \ - world.c \ + world.cpp \ world.h # EOF # diff --git a/src/badguy.c b/src/badguy.cpp similarity index 100% rename from src/badguy.c rename to src/badguy.cpp diff --git a/src/bitmask.c b/src/bitmask.cpp similarity index 100% rename from src/bitmask.c rename to src/bitmask.cpp diff --git a/src/button.c b/src/button.cpp similarity index 100% rename from src/button.c rename to src/button.cpp diff --git a/src/collision.c b/src/collision.cpp similarity index 100% rename from src/collision.c rename to src/collision.cpp diff --git a/src/gameloop.c b/src/gameloop.cpp similarity index 100% rename from src/gameloop.c rename to src/gameloop.cpp diff --git a/src/globals.c b/src/globals.cpp similarity index 100% rename from src/globals.c rename to src/globals.cpp diff --git a/src/high_scores.c b/src/high_scores.cpp similarity index 100% rename from src/high_scores.c rename to src/high_scores.cpp diff --git a/src/intro.c b/src/intro.cpp similarity index 100% rename from src/intro.c rename to src/intro.cpp diff --git a/src/level.c b/src/level.cpp similarity index 100% rename from src/level.c rename to src/level.cpp diff --git a/src/leveleditor.c b/src/leveleditor.cpp similarity index 100% rename from src/leveleditor.c rename to src/leveleditor.cpp diff --git a/src/lispreader.c b/src/lispreader.cpp similarity index 100% rename from src/lispreader.c rename to src/lispreader.cpp diff --git a/src/menu.c b/src/menu.cpp similarity index 100% rename from src/menu.c rename to src/menu.cpp diff --git a/src/physic.c b/src/physic.cpp similarity index 100% rename from src/physic.c rename to src/physic.cpp diff --git a/src/player.c b/src/player.cpp similarity index 100% rename from src/player.c rename to src/player.cpp diff --git a/src/scene.c b/src/scene.cpp similarity index 100% rename from src/scene.c rename to src/scene.cpp diff --git a/src/screen.c b/src/screen.cpp similarity index 100% rename from src/screen.c rename to src/screen.cpp diff --git a/src/setup.c b/src/setup.cpp similarity index 100% rename from src/setup.c rename to src/setup.cpp diff --git a/src/sound.c b/src/sound.cpp similarity index 100% rename from src/sound.c rename to src/sound.cpp diff --git a/src/special.c b/src/special.cpp similarity index 100% rename from src/special.c rename to src/special.cpp diff --git a/src/supertux.c b/src/supertux.cpp similarity index 100% rename from src/supertux.c rename to src/supertux.cpp diff --git a/src/text.c b/src/text.cpp similarity index 100% rename from src/text.c rename to src/text.cpp diff --git a/src/texture.c b/src/texture.cpp similarity index 100% rename from src/texture.c rename to src/texture.cpp diff --git a/src/timer.c b/src/timer.cpp similarity index 100% rename from src/timer.c rename to src/timer.cpp diff --git a/src/title.c b/src/title.cpp similarity index 100% rename from src/title.c rename to src/title.cpp diff --git a/src/type.c b/src/type.cpp similarity index 100% rename from src/type.c rename to src/type.cpp diff --git a/src/world.c b/src/world.cpp similarity index 100% rename from src/world.c rename to src/world.cpp -- 2.11.0