diff --git a/deps/ox/src/ox/CMakeLists.txt b/deps/ox/src/ox/CMakeLists.txt index 5d1399c0..ceecbd8c 100644 --- a/deps/ox/src/ox/CMakeLists.txt +++ b/deps/ox/src/ox/CMakeLists.txt @@ -4,5 +4,5 @@ endif(OX_USE_STDLIB STREQUAL "ON") add_subdirectory(fs) add_subdirectory(mc) add_subdirectory(ptrarith) -add_subdirectory(ser) +add_subdirectory(model) add_subdirectory(std) diff --git a/deps/ox/src/ox/mc/CMakeLists.txt b/deps/ox/src/ox/mc/CMakeLists.txt index 326e0e74..c840220f 100644 --- a/deps/ox/src/ox/mc/CMakeLists.txt +++ b/deps/ox/src/ox/mc/CMakeLists.txt @@ -7,7 +7,7 @@ add_library( target_link_libraries( OxMetalClaw PUBLIC - OxSerialization + OxModel OxStd ) diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index 4a9414f8..19988a5e 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/ox/mc/test/tests.cpp index 7f23d967..23ee2f64 100644 --- a/deps/ox/src/ox/mc/test/tests.cpp +++ b/deps/ox/src/ox/mc/test/tests.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include struct TestStructNest { diff --git a/deps/ox/src/ox/mc/walk.hpp b/deps/ox/src/ox/mc/walk.hpp index 44a42e05..0fc3d229 100644 --- a/deps/ox/src/ox/mc/walk.hpp +++ b/deps/ox/src/ox/mc/walk.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include namespace ox { diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 662b07ee..d1c6aa12 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/deps/ox/src/ox/ser/CMakeLists.txt b/deps/ox/src/ox/model/CMakeLists.txt similarity index 73% rename from deps/ox/src/ox/ser/CMakeLists.txt rename to deps/ox/src/ox/model/CMakeLists.txt index 92fadb6d..45a054c5 100644 --- a/deps/ox/src/ox/ser/CMakeLists.txt +++ b/deps/ox/src/ox/model/CMakeLists.txt @@ -1,17 +1,17 @@ add_library( - OxSerialization + OxModel desctypes.cpp descwrite.cpp ) target_link_libraries( - OxSerialization PUBLIC + OxModel PUBLIC OxStd ) set_property( TARGET - OxSerialization + OxModel PROPERTY POSITION_INDEPENDENT_CODE ON ) @@ -22,14 +22,14 @@ install( desctypes.hpp descwrite.hpp optype.hpp - ser.hpp + model.hpp types.hpp walk.hpp DESTINATION - include/ox/ser + include/ox/model ) -install(TARGETS OxSerialization +install(TARGETS OxModel LIBRARY DESTINATION lib/ox ARCHIVE DESTINATION lib/ox ) diff --git a/deps/ox/src/ox/ser/definition-language.txt b/deps/ox/src/ox/model/definition-language.txt similarity index 100% rename from deps/ox/src/ox/ser/definition-language.txt rename to deps/ox/src/ox/model/definition-language.txt diff --git a/deps/ox/src/ox/ser/descread.hpp b/deps/ox/src/ox/model/descread.hpp similarity index 100% rename from deps/ox/src/ox/ser/descread.hpp rename to deps/ox/src/ox/model/descread.hpp diff --git a/deps/ox/src/ox/ser/desctypes.cpp b/deps/ox/src/ox/model/desctypes.cpp similarity index 100% rename from deps/ox/src/ox/ser/desctypes.cpp rename to deps/ox/src/ox/model/desctypes.cpp diff --git a/deps/ox/src/ox/ser/desctypes.hpp b/deps/ox/src/ox/model/desctypes.hpp similarity index 100% rename from deps/ox/src/ox/ser/desctypes.hpp rename to deps/ox/src/ox/model/desctypes.hpp diff --git a/deps/ox/src/ox/ser/descwrite.cpp b/deps/ox/src/ox/model/descwrite.cpp similarity index 100% rename from deps/ox/src/ox/ser/descwrite.cpp rename to deps/ox/src/ox/model/descwrite.cpp diff --git a/deps/ox/src/ox/ser/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp similarity index 100% rename from deps/ox/src/ox/ser/descwrite.hpp rename to deps/ox/src/ox/model/descwrite.hpp diff --git a/deps/ox/src/ox/ser/ser.hpp b/deps/ox/src/ox/model/model.hpp similarity index 100% rename from deps/ox/src/ox/ser/ser.hpp rename to deps/ox/src/ox/model/model.hpp diff --git a/deps/ox/src/ox/ser/optype.hpp b/deps/ox/src/ox/model/optype.hpp similarity index 100% rename from deps/ox/src/ox/ser/optype.hpp rename to deps/ox/src/ox/model/optype.hpp diff --git a/deps/ox/src/ox/ser/types.hpp b/deps/ox/src/ox/model/types.hpp similarity index 100% rename from deps/ox/src/ox/ser/types.hpp rename to deps/ox/src/ox/model/types.hpp diff --git a/deps/ox/src/ox/ser/walk.hpp b/deps/ox/src/ox/model/walk.hpp similarity index 100% rename from deps/ox/src/ox/ser/walk.hpp rename to deps/ox/src/ox/model/walk.hpp