GitHub-Mirror/Fuzzylite
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Fuzzylite.git synced 2025-03-15 19:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix up include header paths

Browse source
This commit is contained in:
Justin Hammond 2015-01-13 22:52:56 +08:00
parent ee1a7fee77
commit d2eecb7e8a
21 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -77,7 +77,6 @@ if(NOT FL_BACKTRACE)
endif() endif()
include_directories(.) include_directories(.)
include_directories ("${PROJECT_SOURCE_DIR}/fl/")
add_definitions (-std=c++0x) # -std=c++11 add_definitions (-std=c++0x) # -std=c++11
file(STRINGS FL_HEADERS fl-headers) file(STRINGS FL_HEADERS fl-headers)

4
fl/LoggerCpp/Channel.h
View file

@ -10,7 +10,7 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Log.h" #include "fl/LoggerCpp/Log.h"
#include <map> #include <map>
#include <string> #include <string>
@ -19,7 +19,7 @@
// or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available, // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
// or a custom minimal shared_ptr implementation, // or a custom minimal shared_ptr implementation,
// and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
#include "LoggerCpp/shared_ptr.hpp" #include "fl/LoggerCpp/shared_ptr.hpp"
namespace fl { namespace fl {

2
fl/LoggerCpp/Config.h
View file

@ -18,7 +18,7 @@
// or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available, // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
// or a custom minimal shared_ptr implementation, // or a custom minimal shared_ptr implementation,
// and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
#include "LoggerCpp/shared_ptr.hpp" #include "fl/LoggerCpp/shared_ptr.hpp"
namespace fl { namespace fl {

2
fl/LoggerCpp/Exception.h
View file

@ -10,7 +10,7 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Formatter.h" #include "fl/LoggerCpp/Formatter.h"
#include <stdexcept> #include <stdexcept>
#include <cassert> #include <cassert>

4
fl/LoggerCpp/Log.h
View file

@ -10,8 +10,8 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/DateTime.h" #include "fl/LoggerCpp/DateTime.h"
#include "LoggerCpp/Utils.h" #include "fl/LoggerCpp/Utils.h"
#include <sstream> #include <sstream>
#include <iomanip> // For easy use of parametric manipulators (setfill, setprecision) by client code #include <iomanip> // For easy use of parametric manipulators (setfill, setprecision) by client code

4
fl/LoggerCpp/Logger.h
View file

@ -10,8 +10,8 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Log.h" #include "fl/LoggerCpp/Log.h"
#include "LoggerCpp/Channel.h" #include "fl/LoggerCpp/Channel.h"
#include <string> #include <string>

4
fl/LoggerCpp/LoggerCpp.h
View file

@ -18,8 +18,8 @@
// Include useful headers of LoggerC++ // Include useful headers of LoggerC++
#include "LoggerCpp/Logger.h" #include "fl/LoggerCpp/Logger.h"
#include "LoggerCpp/Manager.h" #include "fl/LoggerCpp/Manager.h"
/** /**

8
fl/LoggerCpp/Manager.h
View file

@ -10,10 +10,10 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Log.h" #include "fl/LoggerCpp/Log.h"
#include "LoggerCpp/Channel.h" #include "fl/LoggerCpp/Channel.h"
#include "LoggerCpp/Output.h" #include "fl/LoggerCpp/Output.h"
#include "LoggerCpp/Config.h" #include "fl/LoggerCpp/Config.h"
namespace fl { namespace fl {

4
fl/LoggerCpp/Output.h
View file

@ -10,7 +10,7 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Channel.h" #include "fl/LoggerCpp/Channel.h"
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>
@ -19,7 +19,7 @@
// or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available, // or <memory> (or <tr1/memory>) when C++11 (or experimental C++0x) is available,
// or a custom minimal shared_ptr implementation, // or a custom minimal shared_ptr implementation,
// and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr)
#include "LoggerCpp/shared_ptr.hpp" #include "fl/LoggerCpp/shared_ptr.hpp"
namespace fl { namespace fl {
namespace Log { namespace Log {

4
fl/LoggerCpp/OutputConsole.h
View file

@ -10,8 +10,8 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Output.h" #include "fl/LoggerCpp/Output.h"
#include "LoggerCpp/Config.h" #include "fl/LoggerCpp/Config.h"
namespace fl { namespace fl {
namespace Log { namespace Log {

4
fl/LoggerCpp/OutputDebug.h
View file

@ -10,8 +10,8 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Output.h" #include "fl/LoggerCpp/Output.h"
#include "LoggerCpp/Config.h" #include "fl/LoggerCpp/Config.h"
namespace fl { namespace fl {
namespace Log { namespace Log {

4
fl/LoggerCpp/OutputFile.h
View file

@ -10,8 +10,8 @@
*/ */
#pragma once #pragma once
#include "LoggerCpp/Output.h" #include "fl/LoggerCpp/Output.h"
#include "LoggerCpp/Config.h" #include "fl/LoggerCpp/Config.h"
#include <string> #include <string>

4
src/LoggerCpp/Config.cpp
View file

@ -9,8 +9,8 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/Config.h" #include "fl/LoggerCpp/Config.h"
#include "LoggerCpp/Exception.h" #include "fl/LoggerCpp/Exception.h"
#include <cstdlib> #include <cstdlib>

4
src/LoggerCpp/DateTime.cpp
View file

@ -9,8 +9,8 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/DateTime.h" #include "fl/LoggerCpp/DateTime.h"
#include "LoggerCpp/Utils.h" #include "fl/LoggerCpp/Utils.h"
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>

4
src/LoggerCpp/Log.cpp
View file

@ -9,8 +9,8 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/Log.h" #include "fl/LoggerCpp/Log.h"
#include "LoggerCpp/Logger.h" #include "fl/LoggerCpp/Logger.h"
#include <cstring> #include <cstring>

4
src/LoggerCpp/Logger.cpp
View file

@ -9,8 +9,8 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/Logger.h" #include "fl/LoggerCpp/Logger.h"
#include "LoggerCpp/Manager.h" #include "fl/LoggerCpp/Manager.h"
#include <cassert> #include <cassert>

8
src/LoggerCpp/Manager.cpp
View file

@ -9,11 +9,11 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/Manager.h" #include "fl/LoggerCpp/Manager.h"
#include "LoggerCpp/Exception.h" #include "fl/LoggerCpp/Exception.h"
#include "LoggerCpp/OutputConsole.h" #include "fl/LoggerCpp/OutputConsole.h"
#include "LoggerCpp/OutputFile.h" #include "fl/LoggerCpp/OutputFile.h"
#ifdef WIN32 #ifdef WIN32
#include "LoggerCpp/OutputDebug.h" #include "LoggerCpp/OutputDebug.h"
#endif #endif

2
src/LoggerCpp/OutputConsole.cpp
View file

@ -9,7 +9,7 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/OutputConsole.h" #include "fl/LoggerCpp/OutputConsole.h"
#include <cstdio> #include <cstdio>

2
src/LoggerCpp/OutputDebug.cpp
View file

@ -11,7 +11,7 @@
#ifdef WIN32 #ifdef WIN32
#include "LoggerCpp/OutputDebug.h" #include "fl/LoggerCpp/OutputDebug.h"
#include <Windows.h> #include <Windows.h>

4
src/LoggerCpp/OutputFile.cpp
View file

@ -9,8 +9,8 @@
* or copy at http://opensource.org/licenses/MIT) * or copy at http://opensource.org/licenses/MIT)
*/ */
#include "LoggerCpp/OutputFile.h" #include "fl/LoggerCpp/OutputFile.h"
#include "LoggerCpp/Exception.h" #include "fl/LoggerCpp/Exception.h"
#include <cstdio> #include <cstdio>
#include <sys/types.h> #include <sys/types.h>

2
src/main.cpp
View file

@ -28,7 +28,7 @@
#include <signal.h> #include <signal.h>
#include <fstream> #include <fstream>
#include <sys/time.h> #include <sys/time.h>
#include "LoggerCpp/LoggerCpp.h" #include "fl/LoggerCpp/LoggerCpp.h"
using namespace fl; using namespace fl;