diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-12-24 22:12:21 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:50 +0100 |
commit | c129094a1604f96b4a3a0ca58226e38a2a1b7cdb (patch) | |
tree | 20d5e87ed1ff64507a03f84426be4d8229f77f45 /src | |
parent | 9cb390dc3be41600ebace6969f9cd36cd2dcc021 (diff) | |
download | usdx-c129094a1604f96b4a3a0ca58226e38a2a1b7cdb.tar.gz usdx-c129094a1604f96b4a3a0ca58226e38a2a1b7cdb.tar.xz usdx-c129094a1604f96b4a3a0ca58226e38a2a1b7cdb.zip |
Makefile.inc: modularized flags, removed include dirs
Diffstat (limited to '')
-rw-r--r-- | src/base/image.cpp | 2 | ||||
-rw-r--r-- | src/base/songloading/songloader.hpp | 2 | ||||
-rw-r--r-- | src/base/songloading/songloading_strategy.hpp | 2 | ||||
-rw-r--r-- | src/base/texture.hpp | 2 | ||||
-rw-r--r-- | src/frames/loading_frame.cpp | 4 | ||||
-rw-r--r-- | src/frames/loading_frame.hpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/menu/application.cpp | 2 | ||||
-rw-r--r-- | src/menu/frame_background_image.hpp | 2 | ||||
-rw-r--r-- | src/menu/software_mouse_pointer.hpp | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/src/base/image.cpp b/src/base/image.cpp index 448f4852..1eb09ac1 100644 --- a/src/base/image.cpp +++ b/src/base/image.cpp @@ -24,7 +24,7 @@ * $Id$ */ -#include <image.hpp> +#include "image.hpp" #include <SDL/SDL_image.h> #include "utils/binary_file.hpp" diff --git a/src/base/songloading/songloader.hpp b/src/base/songloading/songloader.hpp index 0f9611fe..94519993 100644 --- a/src/base/songloading/songloader.hpp +++ b/src/base/songloading/songloader.hpp @@ -30,7 +30,7 @@ #include <map> #include <boost/filesystem.hpp> #include <log4cpp/Category.hh> -#include "song.hpp" +#include "../song.hpp" #include "utils/base_exception.hpp" #include "songloading_strategy_base_factory.hpp" diff --git a/src/base/songloading/songloading_strategy.hpp b/src/base/songloading/songloading_strategy.hpp index 3178f6ed..3c2396b8 100644 --- a/src/base/songloading/songloading_strategy.hpp +++ b/src/base/songloading/songloading_strategy.hpp @@ -29,7 +29,7 @@ #include <string> #include <boost/filesystem.hpp> -#include "song.hpp" +#include "../song.hpp" #define _USDX_JOIN(strategy, line) _USDX_JOIN1(strategy, line) #define _USDX_JOIN1(strategy, line) autoregistration__strategy__##line diff --git a/src/base/texture.hpp b/src/base/texture.hpp index fbd88197..29e3afeb 100644 --- a/src/base/texture.hpp +++ b/src/base/texture.hpp @@ -35,7 +35,7 @@ #include "utils/dimension.hpp" #include "utils/rectangle.hpp" #include "image.hpp" -#include "drawable.hpp" +#include "menu/drawable.hpp" namespace usdx { diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp index fac163d6..48996f1f 100644 --- a/src/frames/loading_frame.cpp +++ b/src/frames/loading_frame.cpp @@ -25,8 +25,8 @@ */ #include "loading_frame.hpp" -#include "frame_background_image.hpp" -#include "frame_background_color.hpp" +#include "menu/frame_background_image.hpp" +#include "menu/frame_background_color.hpp" namespace usdx { diff --git a/src/frames/loading_frame.hpp b/src/frames/loading_frame.hpp index 80ef0951..5c698d88 100644 --- a/src/frames/loading_frame.hpp +++ b/src/frames/loading_frame.hpp @@ -27,7 +27,7 @@ #ifndef LOADING_FRAME_HPP #define LOADING_FRAME_HPP -#include "frame.hpp" +#include "menu/frame.hpp" #include <log4cpp/Category.hh> namespace usdx diff --git a/src/main.cpp b/src/main.cpp index 83fa8298..50d9d566 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ * $Id$ */ -#include "application.hpp" +#include "menu/application.hpp" #include <cstdlib> int main (int argc, char** argv) diff --git a/src/menu/application.cpp b/src/menu/application.cpp index d34b8003..d5f9c34f 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -28,7 +28,7 @@ #include "event_manager.hpp" #include <exception> #include "software_mouse_pointer.hpp" -#include "loading_frame.hpp" +#include "frames/loading_frame.hpp" #include <GL/gl.h> #include <log4cpp/PropertyConfigurator.hh> diff --git a/src/menu/frame_background_image.hpp b/src/menu/frame_background_image.hpp index a3349574..de9103c1 100644 --- a/src/menu/frame_background_image.hpp +++ b/src/menu/frame_background_image.hpp @@ -31,7 +31,7 @@ #include <GL/gl.h> #include "frame_background.hpp" -#include "texture.hpp" +#include "base/texture.hpp" namespace usdx { diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp index 3b29e50e..b1f40d06 100644 --- a/src/menu/software_mouse_pointer.hpp +++ b/src/menu/software_mouse_pointer.hpp @@ -30,7 +30,7 @@ #include "drawable_control.hpp" #include "control.hpp" #include "event_manager.hpp" -#include "texture.hpp" +#include "base/texture.hpp" #include <boost/signals2.hpp> #include <boost/thread/mutex.hpp> |