From 660962e894f38c4e4c6e728ce20a5eccb1fd5256 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 14 Jun 2011 21:13:50 +0000 Subject: [PATCH] build: put debug stuff and shader stuff in subdirectories. --- src/Makefile.am | 11 +++++++---- src/core.h | 2 +- src/{debugfps.cpp => debug/fps.cpp} | 2 +- src/{debugfps.h => debug/fps.h} | 0 src/{debugquad.cpp => debug/quad.cpp} | 0 src/{debugquad.h => debug/quad.h} | 0 src/{debugrecord.cpp => debug/record.cpp} | 2 +- src/{debugrecord.h => debug/record.h} | 0 src/{debugsphere.cpp => debug/sphere.cpp} | 2 +- src/{debugsphere.h => debug/sphere.h} | 0 src/{debugstats.cpp => debug/stats.cpp} | 2 +- src/{debugstats.h => debug/stats.h} | 0 src/loldebug.h | 10 +++++----- src/{ => shader}/shader.cpp | 0 src/{ => shader}/shader.h | 0 15 files changed, 17 insertions(+), 14 deletions(-) rename src/{debugfps.cpp => debug/fps.cpp} (99%) rename src/{debugfps.h => debug/fps.h} (100%) rename src/{debugquad.cpp => debug/quad.cpp} (100%) rename src/{debugquad.h => debug/quad.h} (100%) rename src/{debugrecord.cpp => debug/record.cpp} (98%) rename src/{debugrecord.h => debug/record.h} (100%) rename src/{debugsphere.cpp => debug/sphere.cpp} (99%) rename src/{debugsphere.h => debug/sphere.h} (100%) rename src/{debugstats.cpp => debug/stats.cpp} (98%) rename src/{debugstats.h => debug/stats.h} (100%) rename src/{ => shader}/shader.cpp (100%) rename src/{ => shader}/shader.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 33721a8f..3edc749f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,15 +9,18 @@ liblol_a_SOURCES = \ timer.cpp timer.h bitfield.h profiler.cpp profiler.h input.h input.cpp \ world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \ text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.h \ - worldentity.cpp worldentity.h shader.cpp shader.h image.cpp image.h \ + worldentity.cpp worldentity.h image.cpp image.h \ platform.cpp platform.h \ \ sdlapp.cpp sdlapp.h sdlinput.cpp sdlinput.h \ \ eglapp.cpp eglapp.h \ \ - loldebug.h debugfps.cpp debugfps.h debugsphere.cpp debugsphere.h \ - debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h \ - debugquad.cpp debugquad.h + shader/shader.cpp shader/shader.h \ + \ + loldebug.h \ + debug/fps.cpp debug/fps.h debug/sphere.cpp debug/sphere.h \ + debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h \ + debug/quad.cpp debug/quad.h liblol_a_CPPFLAGS = @LOL_CFLAGS@ diff --git a/src/core.h b/src/core.h index 575b6136..2b950f47 100644 --- a/src/core.h +++ b/src/core.h @@ -45,7 +45,7 @@ #include "dict.h" #include "map.h" #include "layer.h" -#include "shader.h" +#include "shader/shader.h" #include "image.h" // Managers diff --git a/src/debugfps.cpp b/src/debug/fps.cpp similarity index 99% rename from src/debugfps.cpp rename to src/debug/fps.cpp index 87185446..5380f94a 100644 --- a/src/debugfps.cpp +++ b/src/debug/fps.cpp @@ -15,7 +15,7 @@ #include #include "core.h" -#include "debugfps.h" +#include "loldebug.h" using namespace std; diff --git a/src/debugfps.h b/src/debug/fps.h similarity index 100% rename from src/debugfps.h rename to src/debug/fps.h diff --git a/src/debugquad.cpp b/src/debug/quad.cpp similarity index 100% rename from src/debugquad.cpp rename to src/debug/quad.cpp diff --git a/src/debugquad.h b/src/debug/quad.h similarity index 100% rename from src/debugquad.h rename to src/debug/quad.h diff --git a/src/debugrecord.cpp b/src/debug/record.cpp similarity index 98% rename from src/debugrecord.cpp rename to src/debug/record.cpp index fcc412c8..73a57bfa 100644 --- a/src/debugrecord.cpp +++ b/src/debug/record.cpp @@ -19,7 +19,7 @@ #endif #include "core.h" -#include "debugrecord.h" +#include "loldebug.h" using namespace std; diff --git a/src/debugrecord.h b/src/debug/record.h similarity index 100% rename from src/debugrecord.h rename to src/debug/record.h diff --git a/src/debugsphere.cpp b/src/debug/sphere.cpp similarity index 99% rename from src/debugsphere.cpp rename to src/debug/sphere.cpp index 462e51ed..bb351f51 100644 --- a/src/debugsphere.cpp +++ b/src/debug/sphere.cpp @@ -22,7 +22,7 @@ #include "core.h" #include "lolgl.h" -#include "debugsphere.h" +#include "loldebug.h" using namespace std; diff --git a/src/debugsphere.h b/src/debug/sphere.h similarity index 100% rename from src/debugsphere.h rename to src/debug/sphere.h diff --git a/src/debugstats.cpp b/src/debug/stats.cpp similarity index 98% rename from src/debugstats.cpp rename to src/debug/stats.cpp index 45630b07..938c4647 100644 --- a/src/debugstats.cpp +++ b/src/debug/stats.cpp @@ -15,7 +15,7 @@ #include #include "core.h" -#include "debugstats.h" +#include "loldebug.h" using namespace std; diff --git a/src/debugstats.h b/src/debug/stats.h similarity index 100% rename from src/debugstats.h rename to src/debug/stats.h diff --git a/src/loldebug.h b/src/loldebug.h index b8f22e2a..515969a0 100644 --- a/src/loldebug.h +++ b/src/loldebug.h @@ -16,11 +16,11 @@ #if !defined __LOL_LOLDEBUG_H__ #define __LOL_LOLDEBUG_H__ -#include "debugfps.h" -#include "debugquad.h" -#include "debugrecord.h" -#include "debugsphere.h" -#include "debugstats.h" +#include "debug/fps.h" +#include "debug/quad.h" +#include "debug/record.h" +#include "debug/sphere.h" +#include "debug/stats.h" #endif // __LOL_LOLDEBUG_H__ diff --git a/src/shader.cpp b/src/shader/shader.cpp similarity index 100% rename from src/shader.cpp rename to src/shader/shader.cpp diff --git a/src/shader.h b/src/shader/shader.h similarity index 100% rename from src/shader.h rename to src/shader/shader.h