diff --git a/libs/yaml/include/yaml-cpp/binary.h b/libs/yaml/include/yaml-cpp/binary.h index 29d5dbd..151c2b5 100644 --- a/libs/yaml/include/yaml-cpp/binary.h +++ b/libs/yaml/include/yaml-cpp/binary.h @@ -10,7 +10,7 @@ #include #include -#include "yaml-cpp/dll.h" +#include "dll.h" namespace YAML { YAML_CPP_API std::string EncodeBase64(const unsigned char *data, diff --git a/libs/yaml/include/yaml-cpp/emitter.h b/libs/yaml/include/yaml-cpp/emitter.h index ef92cc4..2edc32a 100644 --- a/libs/yaml/include/yaml-cpp/emitter.h +++ b/libs/yaml/include/yaml-cpp/emitter.h @@ -12,13 +12,13 @@ #include #include -#include "yaml-cpp/binary.h" -#include "yaml-cpp/dll.h" -#include "yaml-cpp/emitterdef.h" -#include "yaml-cpp/emittermanip.h" -#include "yaml-cpp/noncopyable.h" -#include "yaml-cpp/null.h" -#include "yaml-cpp/ostream_wrapper.h" +#include "binary.h" +#include "dll.h" +#include "emitterdef.h" +#include "emittermanip.h" +#include "noncopyable.h" +#include "null.h" +#include "ostream_wrapper.h" namespace YAML { class Binary; diff --git a/libs/yaml/include/yaml-cpp/exceptions.h b/libs/yaml/include/yaml-cpp/exceptions.h index 1f798c4..6d38bff 100644 --- a/libs/yaml/include/yaml-cpp/exceptions.h +++ b/libs/yaml/include/yaml-cpp/exceptions.h @@ -7,8 +7,8 @@ #pragma once #endif -#include "yaml-cpp/mark.h" -#include "yaml-cpp/traits.h" +#include "mark.h" +#include "traits.h" #include #include #include diff --git a/libs/yaml/include/yaml-cpp/mark.h b/libs/yaml/include/yaml-cpp/mark.h index bf94b4f..8ba7dfa 100644 --- a/libs/yaml/include/yaml-cpp/mark.h +++ b/libs/yaml/include/yaml-cpp/mark.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "yaml-cpp/dll.h" +#include "dll.h" namespace YAML { struct YAML_CPP_API Mark { diff --git a/libs/yaml/include/yaml-cpp/node/convert.h b/libs/yaml/include/yaml-cpp/node/convert.h index 45a878a..2242e59 100644 --- a/libs/yaml/include/yaml-cpp/node/convert.h +++ b/libs/yaml/include/yaml-cpp/node/convert.h @@ -14,12 +14,12 @@ #include #include -#include "yaml-cpp/binary.h" -#include "yaml-cpp/node/impl.h" -#include "yaml-cpp/node/iterator.h" -#include "yaml-cpp/node/node.h" -#include "yaml-cpp/node/type.h" -#include "yaml-cpp/null.h" +#include "../binary.h" +#include "impl.h" +#include "iterator.h" +#include "node.h" +#include "type.h" +#include "../null.h" namespace YAML { class Binary; diff --git a/libs/yaml/include/yaml-cpp/node/detail/impl.h b/libs/yaml/include/yaml-cpp/node/detail/impl.h index 360b9e4..a5cf640 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/impl.h +++ b/libs/yaml/include/yaml-cpp/node/detail/impl.h @@ -7,8 +7,8 @@ #pragma once #endif -#include "yaml-cpp/node/detail/node.h" -#include "yaml-cpp/node/detail/node_data.h" +#include "node.h" +#include "node_data.h" #include namespace YAML { diff --git a/libs/yaml/include/yaml-cpp/node/detail/iterator.h b/libs/yaml/include/yaml-cpp/node/detail/iterator.h index f2d4927..7e9c32a 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/iterator.h +++ b/libs/yaml/include/yaml-cpp/node/detail/iterator.h @@ -7,9 +7,9 @@ #pragma once #endif -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/ptr.h" -#include "yaml-cpp/node/detail/node_iterator.h" +#include "../../dll.h" +#include "../ptr.h" +#include "node_iterator.h" #include #include diff --git a/libs/yaml/include/yaml-cpp/node/detail/iterator_fwd.h b/libs/yaml/include/yaml-cpp/node/detail/iterator_fwd.h index 5f1ffe7..141f8e8 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/iterator_fwd.h +++ b/libs/yaml/include/yaml-cpp/node/detail/iterator_fwd.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "yaml-cpp/dll.h" +#include "../../dll.h" #include #include #include diff --git a/libs/yaml/include/yaml-cpp/node/detail/memory.h b/libs/yaml/include/yaml-cpp/node/detail/memory.h index 8f2bc26..b9e98dd 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/memory.h +++ b/libs/yaml/include/yaml-cpp/node/detail/memory.h @@ -9,8 +9,8 @@ #include -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/ptr.h" +#include "../../dll.h" +#include "../ptr.h" namespace YAML { namespace detail { diff --git a/libs/yaml/include/yaml-cpp/node/detail/node.h b/libs/yaml/include/yaml-cpp/node/detail/node.h index 3154a52..ddbc7bb 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/node.h +++ b/libs/yaml/include/yaml-cpp/node/detail/node.h @@ -7,11 +7,11 @@ #pragma once #endif -#include "yaml-cpp/emitterstyle.h" -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/type.h" -#include "yaml-cpp/node/ptr.h" -#include "yaml-cpp/node/detail/node_ref.h" +#include "../../emitterstyle.h" +#include "../../dll.h" +#include "../type.h" +#include "../ptr.h" +#include "node_ref.h" #include namespace YAML { diff --git a/libs/yaml/include/yaml-cpp/node/detail/node_data.h b/libs/yaml/include/yaml-cpp/node/detail/node_data.h index 50bcd74..152aa60 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/node_data.h +++ b/libs/yaml/include/yaml-cpp/node/detail/node_data.h @@ -13,11 +13,11 @@ #include #include -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/detail/node_iterator.h" -#include "yaml-cpp/node/iterator.h" -#include "yaml-cpp/node/ptr.h" -#include "yaml-cpp/node/type.h" +#include "../../dll.h" +#include "node_iterator.h" +#include "../iterator.h" +#include "../ptr.h" +#include "../type.h" namespace YAML { namespace detail { diff --git a/libs/yaml/include/yaml-cpp/node/detail/node_iterator.h b/libs/yaml/include/yaml-cpp/node/detail/node_iterator.h index 4337df4..6234a73 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/node_iterator.h +++ b/libs/yaml/include/yaml-cpp/node/detail/node_iterator.h @@ -7,8 +7,8 @@ #pragma once #endif -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/ptr.h" +#include "../../dll.h" +#include "../ptr.h" #include #include #include diff --git a/libs/yaml/include/yaml-cpp/node/detail/node_ref.h b/libs/yaml/include/yaml-cpp/node/detail/node_ref.h index d8a94f8..134190c 100644 --- a/libs/yaml/include/yaml-cpp/node/detail/node_ref.h +++ b/libs/yaml/include/yaml-cpp/node/detail/node_ref.h @@ -7,10 +7,10 @@ #pragma once #endif -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/type.h" -#include "yaml-cpp/node/ptr.h" -#include "yaml-cpp/node/detail/node_data.h" +#include "../../dll.h" +#include "../type.h" +#include "../ptr.h" +#include "node_data.h" namespace YAML { namespace detail { diff --git a/libs/yaml/include/yaml-cpp/node/emit.h b/libs/yaml/include/yaml-cpp/node/emit.h index 032268c..fce0cdf 100644 --- a/libs/yaml/include/yaml-cpp/node/emit.h +++ b/libs/yaml/include/yaml-cpp/node/emit.h @@ -10,7 +10,7 @@ #include #include -#include "yaml-cpp/dll.h" +#include "../dll.h" namespace YAML { class Emitter; diff --git a/libs/yaml/include/yaml-cpp/node/impl.h b/libs/yaml/include/yaml-cpp/node/impl.h index 7c6b957..002116b 100644 --- a/libs/yaml/include/yaml-cpp/node/impl.h +++ b/libs/yaml/include/yaml-cpp/node/impl.h @@ -13,11 +13,11 @@ #define THROW(x) #endif -#include "yaml-cpp/node/node.h" -#include "yaml-cpp/node/iterator.h" -#include "yaml-cpp/node/detail/memory.h" -#include "yaml-cpp/node/detail/node.h" -#include "yaml-cpp/exceptions.h" +#include "node.h" +#include "iterator.h" +#include "detail/memory.h" +#include "detail/node.h" +#include "../exceptions.h" #include namespace YAML { diff --git a/libs/yaml/include/yaml-cpp/node/iterator.h b/libs/yaml/include/yaml-cpp/node/iterator.h index 366a9c8..f7c7eaa 100644 --- a/libs/yaml/include/yaml-cpp/node/iterator.h +++ b/libs/yaml/include/yaml-cpp/node/iterator.h @@ -7,10 +7,10 @@ #pragma once #endif -#include "yaml-cpp/dll.h" -#include "yaml-cpp/node/node.h" -#include "yaml-cpp/node/detail/iterator_fwd.h" -#include "yaml-cpp/node/detail/iterator.h" +#include "../dll.h" +#include "node.h" +#include "detail/iterator_fwd.h" +#include "detail/iterator.h" #include #include #include diff --git a/libs/yaml/include/yaml-cpp/node/node.h b/libs/yaml/include/yaml-cpp/node/node.h index a51ea53..e87d131 100644 --- a/libs/yaml/include/yaml-cpp/node/node.h +++ b/libs/yaml/include/yaml-cpp/node/node.h @@ -9,13 +9,13 @@ #include -#include "yaml-cpp/dll.h" -#include "yaml-cpp/emitterstyle.h" -#include "yaml-cpp/mark.h" -#include "yaml-cpp/node/detail/bool_type.h" -#include "yaml-cpp/node/detail/iterator_fwd.h" -#include "yaml-cpp/node/ptr.h" -#include "yaml-cpp/node/type.h" +#include "../dll.h" +#include "../emitterstyle.h" +#include "../mark.h" +#include "../node/detail/bool_type.h" +#include "../node/detail/iterator_fwd.h" +#include "../node/ptr.h" +#include "../node/type.h" namespace YAML { namespace detail { diff --git a/libs/yaml/include/yaml-cpp/node/parse.h b/libs/yaml/include/yaml-cpp/node/parse.h index 7745fd7..2f3e332 100644 --- a/libs/yaml/include/yaml-cpp/node/parse.h +++ b/libs/yaml/include/yaml-cpp/node/parse.h @@ -11,7 +11,7 @@ #include #include -#include "yaml-cpp/dll.h" +#include "../dll.h" namespace YAML { class Node; diff --git a/libs/yaml/include/yaml-cpp/node/ptr.h b/libs/yaml/include/yaml-cpp/node/ptr.h index ce085dd..3bfc8cc 100644 --- a/libs/yaml/include/yaml-cpp/node/ptr.h +++ b/libs/yaml/include/yaml-cpp/node/ptr.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "yaml-cpp/dll.h" +#include "../dll.h" #include namespace YAML { diff --git a/libs/yaml/include/yaml-cpp/noncopyable.h b/libs/yaml/include/yaml-cpp/noncopyable.h index a261040..856a4ae 100644 --- a/libs/yaml/include/yaml-cpp/noncopyable.h +++ b/libs/yaml/include/yaml-cpp/noncopyable.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "yaml-cpp/dll.h" +#include "dll.h" namespace YAML { // this is basically boost::noncopyable diff --git a/libs/yaml/include/yaml-cpp/null.h b/libs/yaml/include/yaml-cpp/null.h index b9521d4..cd01112 100644 --- a/libs/yaml/include/yaml-cpp/null.h +++ b/libs/yaml/include/yaml-cpp/null.h @@ -7,7 +7,7 @@ #pragma once #endif -#include "yaml-cpp/dll.h" +#include "dll.h" #include namespace YAML { diff --git a/libs/yaml/include/yaml-cpp/ostream_wrapper.h b/libs/yaml/include/yaml-cpp/ostream_wrapper.h index 09d45f3..5209fb8 100644 --- a/libs/yaml/include/yaml-cpp/ostream_wrapper.h +++ b/libs/yaml/include/yaml-cpp/ostream_wrapper.h @@ -10,7 +10,7 @@ #include #include -#include "yaml-cpp/dll.h" +#include "dll.h" namespace YAML { class YAML_CPP_API ostream_wrapper { diff --git a/libs/yaml/include/yaml-cpp/parser.h b/libs/yaml/include/yaml-cpp/parser.h index 0e8a73e..b948b4e 100644 --- a/libs/yaml/include/yaml-cpp/parser.h +++ b/libs/yaml/include/yaml-cpp/parser.h @@ -10,8 +10,8 @@ #include #include -#include "yaml-cpp/dll.h" -#include "yaml-cpp/noncopyable.h" +#include "dll.h" +#include "noncopyable.h" namespace YAML { class EventHandler; diff --git a/libs/yaml/include/yaml-cpp/yaml.h b/libs/yaml/include/yaml-cpp/yaml.h index 7f515ef..a8e47c4 100644 --- a/libs/yaml/include/yaml-cpp/yaml.h +++ b/libs/yaml/include/yaml-cpp/yaml.h @@ -7,18 +7,18 @@ #pragma once #endif -#include "yaml-cpp/parser.h" -#include "yaml-cpp/emitter.h" -#include "yaml-cpp/emitterstyle.h" -#include "yaml-cpp/stlemitter.h" -#include "yaml-cpp/exceptions.h" +#include "parser.h" +#include "emitter.h" +#include "emitterstyle.h" +#include "stlemitter.h" +#include "exceptions.h" -#include "yaml-cpp/node/node.h" -#include "yaml-cpp/node/impl.h" -#include "yaml-cpp/node/convert.h" -#include "yaml-cpp/node/iterator.h" -#include "yaml-cpp/node/detail/impl.h" -#include "yaml-cpp/node/parse.h" -#include "yaml-cpp/node/emit.h" +#include "node/node.h" +#include "node/impl.h" +#include "node/convert.h" +#include "node/iterator.h" +#include "node/detail/impl.h" +#include "node/parse.h" +#include "node/emit.h" #endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 diff --git a/src/save/YAML.cpp b/src/save/YAML.cpp index dce49c6..8c9c001 100644 --- a/src/save/YAML.cpp +++ b/src/save/YAML.cpp @@ -2,7 +2,7 @@ #include -#include "yaml-cpp/yaml.h" +#include "../libs/yaml/include/yaml-cpp/yaml.h" #include "Platform.h" #include "Data.h"