diff --git a/Makefile.am b/Makefile.am index 3790687..ad33981 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,106 +1,4 @@ -SUBDIRS = build data resources - -bin_PROGRAMS = etr - -etr_SOURCES = \ - audio.cpp \ - common.cpp \ - config_screen.cpp \ - course.cpp \ - course_render.cpp \ - credits.cpp \ - env.cpp \ - event.cpp \ - event_select.cpp \ - font.cpp \ - ft_font.cpp \ - game_config.cpp \ - game_ctrl.cpp \ - game_over.cpp \ - game_type_select.cpp \ - gui.cpp \ - help.cpp \ - hud.cpp \ - intro.cpp \ - keyframe.cpp \ - loading.cpp \ - main.cpp \ - mathlib.cpp \ - newplayer.cpp \ - ogl.cpp \ - ogl_test.cpp \ - particles.cpp \ - paused.cpp \ - physics.cpp \ - quadtree.cpp \ - race_select.cpp \ - racing.cpp \ - regist.cpp \ - reset.cpp \ - score.cpp \ - splash_screen.cpp \ - spx.cpp \ - states.cpp \ - textures.cpp \ - tool_char.cpp \ - tool_frame.cpp \ - tools.cpp \ - track_marks.cpp \ - translation.cpp \ - tux.cpp \ - view.cpp \ - winsys.cpp - -noinst_HEADERS = \ - audio.h \ - bh.h \ - common.h \ - config_screen.h \ - course.h \ - course_render.h \ - credits.h \ - env.h \ - etr_types.h \ - event.h \ - event_select.h \ - font.h \ - ft_font.h \ - game_config.h \ - game_ctrl.h \ - game_over.h \ - game_type_select.h \ - gui.h \ - help.h \ - hud.h \ - intro.h \ - keyframe.h \ - loading.h \ - mathlib.h \ - newplayer.h \ - ogl.h \ - ogl_test.h \ - particles.h \ - paused.h \ - physics.h \ - quadtree.h \ - race_select.h \ - racing.h \ - regist.h \ - reset.h \ - score.h \ - splash_screen.h \ - spx.h \ - states.h \ - textures.h \ - tool_char.h \ - tool_frame.h \ - tools.h \ - track_marks.h \ - translation.h \ - tux.h \ - version.h \ - view.h \ - winsys.h +SUBDIRS = src build data resources EXTRA_DIST = \ autogen.sh \ diff --git a/configure.ac b/configure.ac index ffc44af..c7fc6b9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.61]) AC_INIT([etr], [0.6-beta1+], [https://sourceforge.net/apps/phpbb/extremetuxracer]) -AC_CONFIG_SRCDIR([gui.cpp]) +AC_CONFIG_SRCDIR([src/gui.cpp]) AC_CONFIG_HEADERS([etr_config.h]) AM_INIT_AUTOMAKE([dist-xz dist-zip]) @@ -77,6 +77,7 @@ CXXFLAGS="${CXXFLAGS} -std=c++11" AC_CONFIG_FILES([ Makefile + src/Makefile build/Makefile build/Installer/Makefile data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..e735fc4 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,101 @@ +bin_PROGRAMS = etr + +etr_SOURCES = \ + audio.cpp \ + common.cpp \ + config_screen.cpp \ + course.cpp \ + course_render.cpp \ + credits.cpp \ + env.cpp \ + event.cpp \ + event_select.cpp \ + font.cpp \ + ft_font.cpp \ + game_config.cpp \ + game_ctrl.cpp \ + game_over.cpp \ + game_type_select.cpp \ + gui.cpp \ + help.cpp \ + hud.cpp \ + intro.cpp \ + keyframe.cpp \ + loading.cpp \ + main.cpp \ + mathlib.cpp \ + newplayer.cpp \ + ogl.cpp \ + ogl_test.cpp \ + particles.cpp \ + paused.cpp \ + physics.cpp \ + quadtree.cpp \ + race_select.cpp \ + racing.cpp \ + regist.cpp \ + reset.cpp \ + score.cpp \ + splash_screen.cpp \ + spx.cpp \ + states.cpp \ + textures.cpp \ + tool_char.cpp \ + tool_frame.cpp \ + tools.cpp \ + track_marks.cpp \ + translation.cpp \ + tux.cpp \ + view.cpp \ + winsys.cpp + +noinst_HEADERS = \ + audio.h \ + bh.h \ + common.h \ + config_screen.h \ + course.h \ + course_render.h \ + credits.h \ + env.h \ + etr_types.h \ + event.h \ + event_select.h \ + font.h \ + ft_font.h \ + game_config.h \ + game_ctrl.h \ + game_over.h \ + game_type_select.h \ + gui.h \ + help.h \ + hud.h \ + intro.h \ + keyframe.h \ + loading.h \ + mathlib.h \ + newplayer.h \ + ogl.h \ + ogl_test.h \ + particles.h \ + paused.h \ + physics.h \ + quadtree.h \ + race_select.h \ + racing.h \ + regist.h \ + reset.h \ + score.h \ + splash_screen.h \ + spx.h \ + states.h \ + textures.h \ + tool_char.h \ + tool_frame.h \ + tools.h \ + track_marks.h \ + translation.h \ + tux.h \ + version.h \ + view.h \ + winsys.h diff --git a/audio.cpp b/src/audio.cpp similarity index 100% rename from audio.cpp rename to src/audio.cpp diff --git a/audio.h b/src/audio.h similarity index 100% rename from audio.h rename to src/audio.h diff --git a/bh.h b/src/bh.h similarity index 100% rename from bh.h rename to src/bh.h diff --git a/common.cpp b/src/common.cpp similarity index 100% rename from common.cpp rename to src/common.cpp diff --git a/common.h b/src/common.h similarity index 100% rename from common.h rename to src/common.h diff --git a/config_screen.cpp b/src/config_screen.cpp similarity index 100% rename from config_screen.cpp rename to src/config_screen.cpp diff --git a/config_screen.h b/src/config_screen.h similarity index 100% rename from config_screen.h rename to src/config_screen.h diff --git a/course.cpp b/src/course.cpp similarity index 100% rename from course.cpp rename to src/course.cpp diff --git a/course.h b/src/course.h similarity index 100% rename from course.h rename to src/course.h diff --git a/course_render.cpp b/src/course_render.cpp similarity index 100% rename from course_render.cpp rename to src/course_render.cpp diff --git a/course_render.h b/src/course_render.h similarity index 100% rename from course_render.h rename to src/course_render.h diff --git a/credits.cpp b/src/credits.cpp similarity index 100% rename from credits.cpp rename to src/credits.cpp diff --git a/credits.h b/src/credits.h similarity index 100% rename from credits.h rename to src/credits.h diff --git a/env.cpp b/src/env.cpp similarity index 100% rename from env.cpp rename to src/env.cpp diff --git a/env.h b/src/env.h similarity index 100% rename from env.h rename to src/env.h diff --git a/etr_types.h b/src/etr_types.h similarity index 100% rename from etr_types.h rename to src/etr_types.h diff --git a/event.cpp b/src/event.cpp similarity index 100% rename from event.cpp rename to src/event.cpp diff --git a/event.h b/src/event.h similarity index 100% rename from event.h rename to src/event.h diff --git a/event_select.cpp b/src/event_select.cpp similarity index 100% rename from event_select.cpp rename to src/event_select.cpp diff --git a/event_select.h b/src/event_select.h similarity index 100% rename from event_select.h rename to src/event_select.h diff --git a/font.cpp b/src/font.cpp similarity index 100% rename from font.cpp rename to src/font.cpp diff --git a/font.h b/src/font.h similarity index 100% rename from font.h rename to src/font.h diff --git a/ft_font.cpp b/src/ft_font.cpp similarity index 100% rename from ft_font.cpp rename to src/ft_font.cpp diff --git a/ft_font.h b/src/ft_font.h similarity index 100% rename from ft_font.h rename to src/ft_font.h diff --git a/game_config.cpp b/src/game_config.cpp similarity index 100% rename from game_config.cpp rename to src/game_config.cpp diff --git a/game_config.h b/src/game_config.h similarity index 100% rename from game_config.h rename to src/game_config.h diff --git a/game_ctrl.cpp b/src/game_ctrl.cpp similarity index 100% rename from game_ctrl.cpp rename to src/game_ctrl.cpp diff --git a/game_ctrl.h b/src/game_ctrl.h similarity index 100% rename from game_ctrl.h rename to src/game_ctrl.h diff --git a/game_over.cpp b/src/game_over.cpp similarity index 100% rename from game_over.cpp rename to src/game_over.cpp diff --git a/game_over.h b/src/game_over.h similarity index 100% rename from game_over.h rename to src/game_over.h diff --git a/game_type_select.cpp b/src/game_type_select.cpp similarity index 100% rename from game_type_select.cpp rename to src/game_type_select.cpp diff --git a/game_type_select.h b/src/game_type_select.h similarity index 100% rename from game_type_select.h rename to src/game_type_select.h diff --git a/gui.cpp b/src/gui.cpp similarity index 100% rename from gui.cpp rename to src/gui.cpp diff --git a/gui.h b/src/gui.h similarity index 100% rename from gui.h rename to src/gui.h diff --git a/help.cpp b/src/help.cpp similarity index 100% rename from help.cpp rename to src/help.cpp diff --git a/help.h b/src/help.h similarity index 100% rename from help.h rename to src/help.h diff --git a/hud.cpp b/src/hud.cpp similarity index 100% rename from hud.cpp rename to src/hud.cpp diff --git a/hud.h b/src/hud.h similarity index 100% rename from hud.h rename to src/hud.h diff --git a/intro.cpp b/src/intro.cpp similarity index 100% rename from intro.cpp rename to src/intro.cpp diff --git a/intro.h b/src/intro.h similarity index 100% rename from intro.h rename to src/intro.h diff --git a/keyframe.cpp b/src/keyframe.cpp similarity index 100% rename from keyframe.cpp rename to src/keyframe.cpp diff --git a/keyframe.h b/src/keyframe.h similarity index 100% rename from keyframe.h rename to src/keyframe.h diff --git a/loading.cpp b/src/loading.cpp similarity index 100% rename from loading.cpp rename to src/loading.cpp diff --git a/loading.h b/src/loading.h similarity index 100% rename from loading.h rename to src/loading.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mathlib.cpp b/src/mathlib.cpp similarity index 100% rename from mathlib.cpp rename to src/mathlib.cpp diff --git a/mathlib.h b/src/mathlib.h similarity index 100% rename from mathlib.h rename to src/mathlib.h diff --git a/newplayer.cpp b/src/newplayer.cpp similarity index 100% rename from newplayer.cpp rename to src/newplayer.cpp diff --git a/newplayer.h b/src/newplayer.h similarity index 100% rename from newplayer.h rename to src/newplayer.h diff --git a/ogl.cpp b/src/ogl.cpp similarity index 100% rename from ogl.cpp rename to src/ogl.cpp diff --git a/ogl.h b/src/ogl.h similarity index 100% rename from ogl.h rename to src/ogl.h diff --git a/ogl_test.cpp b/src/ogl_test.cpp similarity index 100% rename from ogl_test.cpp rename to src/ogl_test.cpp diff --git a/ogl_test.h b/src/ogl_test.h similarity index 100% rename from ogl_test.h rename to src/ogl_test.h diff --git a/particles.cpp b/src/particles.cpp similarity index 100% rename from particles.cpp rename to src/particles.cpp diff --git a/particles.h b/src/particles.h similarity index 100% rename from particles.h rename to src/particles.h diff --git a/paused.cpp b/src/paused.cpp similarity index 100% rename from paused.cpp rename to src/paused.cpp diff --git a/paused.h b/src/paused.h similarity index 100% rename from paused.h rename to src/paused.h diff --git a/physics.cpp b/src/physics.cpp similarity index 100% rename from physics.cpp rename to src/physics.cpp diff --git a/physics.h b/src/physics.h similarity index 100% rename from physics.h rename to src/physics.h diff --git a/quadtree.cpp b/src/quadtree.cpp similarity index 100% rename from quadtree.cpp rename to src/quadtree.cpp diff --git a/quadtree.h b/src/quadtree.h similarity index 100% rename from quadtree.h rename to src/quadtree.h diff --git a/race_select.cpp b/src/race_select.cpp similarity index 100% rename from race_select.cpp rename to src/race_select.cpp diff --git a/race_select.h b/src/race_select.h similarity index 100% rename from race_select.h rename to src/race_select.h diff --git a/racing.cpp b/src/racing.cpp similarity index 100% rename from racing.cpp rename to src/racing.cpp diff --git a/racing.h b/src/racing.h similarity index 100% rename from racing.h rename to src/racing.h diff --git a/regist.cpp b/src/regist.cpp similarity index 100% rename from regist.cpp rename to src/regist.cpp diff --git a/regist.h b/src/regist.h similarity index 100% rename from regist.h rename to src/regist.h diff --git a/reset.cpp b/src/reset.cpp similarity index 100% rename from reset.cpp rename to src/reset.cpp diff --git a/reset.h b/src/reset.h similarity index 100% rename from reset.h rename to src/reset.h diff --git a/score.cpp b/src/score.cpp similarity index 100% rename from score.cpp rename to src/score.cpp diff --git a/score.h b/src/score.h similarity index 100% rename from score.h rename to src/score.h diff --git a/splash_screen.cpp b/src/splash_screen.cpp similarity index 100% rename from splash_screen.cpp rename to src/splash_screen.cpp diff --git a/splash_screen.h b/src/splash_screen.h similarity index 100% rename from splash_screen.h rename to src/splash_screen.h diff --git a/spx.cpp b/src/spx.cpp similarity index 100% rename from spx.cpp rename to src/spx.cpp diff --git a/spx.h b/src/spx.h similarity index 100% rename from spx.h rename to src/spx.h diff --git a/states.cpp b/src/states.cpp similarity index 100% rename from states.cpp rename to src/states.cpp diff --git a/states.h b/src/states.h similarity index 100% rename from states.h rename to src/states.h diff --git a/textures.cpp b/src/textures.cpp similarity index 100% rename from textures.cpp rename to src/textures.cpp diff --git a/textures.h b/src/textures.h similarity index 100% rename from textures.h rename to src/textures.h diff --git a/tool_char.cpp b/src/tool_char.cpp similarity index 100% rename from tool_char.cpp rename to src/tool_char.cpp diff --git a/tool_char.h b/src/tool_char.h similarity index 100% rename from tool_char.h rename to src/tool_char.h diff --git a/tool_frame.cpp b/src/tool_frame.cpp similarity index 100% rename from tool_frame.cpp rename to src/tool_frame.cpp diff --git a/tool_frame.h b/src/tool_frame.h similarity index 100% rename from tool_frame.h rename to src/tool_frame.h diff --git a/tools.cpp b/src/tools.cpp similarity index 100% rename from tools.cpp rename to src/tools.cpp diff --git a/tools.h b/src/tools.h similarity index 100% rename from tools.h rename to src/tools.h diff --git a/track_marks.cpp b/src/track_marks.cpp similarity index 100% rename from track_marks.cpp rename to src/track_marks.cpp diff --git a/track_marks.h b/src/track_marks.h similarity index 100% rename from track_marks.h rename to src/track_marks.h diff --git a/translation.cpp b/src/translation.cpp similarity index 100% rename from translation.cpp rename to src/translation.cpp diff --git a/translation.h b/src/translation.h similarity index 100% rename from translation.h rename to src/translation.h diff --git a/tux.cpp b/src/tux.cpp similarity index 100% rename from tux.cpp rename to src/tux.cpp diff --git a/tux.h b/src/tux.h similarity index 100% rename from tux.h rename to src/tux.h diff --git a/version.h b/src/version.h similarity index 100% rename from version.h rename to src/version.h diff --git a/view.cpp b/src/view.cpp similarity index 100% rename from view.cpp rename to src/view.cpp diff --git a/view.h b/src/view.h similarity index 100% rename from view.h rename to src/view.h diff --git a/winsys.cpp b/src/winsys.cpp similarity index 100% rename from winsys.cpp rename to src/winsys.cpp diff --git a/winsys.h b/src/winsys.h similarity index 100% rename from winsys.h rename to src/winsys.h