From bd792a0d254e9d27290b38fbf35ae626f4af16d3 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 6 May 2026 00:27:22 -0500 Subject: [PATCH] [ox] Move header files to include directory --- CMakeLists.txt | 7 ++ {src => include}/ox/clargs/clargs.hpp | 0 {src => include}/ox/claw/claw.hpp | 0 {src => include}/ox/claw/format.hpp | 0 {src => include}/ox/claw/read.hpp | 0 {src => include}/ox/claw/write.hpp | 0 {src => include}/ox/event/event.hpp | 0 {src => include}/ox/event/signal.hpp | 0 .../ox/fs/filestore/filestoretemplate.hpp | 0 .../ox/fs/filesystem/directory.hpp | 0 .../ox/fs/filesystem/filelocation.hpp | 0 .../ox/fs/filesystem/filesystem.hpp | 0 .../ox/fs/filesystem/passthroughfs.hpp | 0 .../ox/fs/filesystem/pathiterator.hpp | 0 {src => include}/ox/fs/filesystem/types.hpp | 0 {src => include}/ox/fs/fs.hpp | 0 .../ox/fs/ptrarith/nodebuffer.hpp | 0 {src => include}/ox/fs/ptrarith/ptr.hpp | 0 {src => include}/ox/logconn/circularbuff.hpp | 0 {src => include}/ox/logconn/def.hpp | 0 {src => include}/ox/logconn/logconn.hpp | 0 {src => include}/ox/mc/err.hpp | 0 {src => include}/ox/mc/intops.hpp | 0 {src => include}/ox/mc/mc.hpp | 0 {src => include}/ox/mc/presenceindicator.hpp | 0 {src => include}/ox/mc/read.hpp | 0 {src => include}/ox/mc/types.hpp | 0 {src => include}/ox/mc/write.hpp | 0 {src => include}/ox/model/def.hpp | 0 include/ox/model/definition-language.txt | 7 ++ {src => include}/ox/model/descread.hpp | 0 {src => include}/ox/model/desctypes.hpp | 0 {src => include}/ox/model/descwrite.hpp | 0 {src => include}/ox/model/fieldcounter.hpp | 0 {src => include}/ox/model/metadata.hpp | 0 {src => include}/ox/model/model.hpp | 0 .../ox/model/modelhandleradaptor.hpp | 0 {src => include}/ox/model/modelops.hpp | 0 {src => include}/ox/model/modelvalue.hpp | 0 {src => include}/ox/model/optype.hpp | 0 {src => include}/ox/model/typenamecatcher.hpp | 0 {src => include}/ox/model/types.hpp | 0 {src => include}/ox/model/typestore.hpp | 0 {src => include}/ox/model/walk.hpp | 0 {src => include}/ox/oc/oc.hpp | 0 {src => include}/ox/oc/read.hpp | 0 {src => include}/ox/oc/write.hpp | 0 .../ox/preloader/alignmentcatcher.hpp | 0 {src => include}/ox/preloader/platspecs.hpp | 0 {src => include}/ox/preloader/preloader.hpp | 0 {src => include}/ox/preloader/sizecatcher.hpp | 0 .../ox/preloader/unionsizecatcher.hpp | 0 {src => include}/ox/std/algorithm.hpp | 0 {src => include}/ox/std/anyptr.hpp | 0 {src => include}/ox/std/array.hpp | 0 {src => include}/ox/std/assert.hpp | 0 {src => include}/ox/std/basestringview.hpp | 0 {src => include}/ox/std/bit.hpp | 0 {src => include}/ox/std/bounds.hpp | 0 {src => include}/ox/std/buffer.hpp | 0 {src => include}/ox/std/buildinfo.hpp | 0 {src => include}/ox/std/byteswap.hpp | 0 {src => include}/ox/std/concepts.hpp | 0 {src => include}/ox/std/conv.hpp | 0 {src => include}/ox/std/cstringview.hpp | 0 {src => include}/ox/std/cstrops.hpp | 0 {src => include}/ox/std/def.hpp | 0 {src => include}/ox/std/defer.hpp | 0 {src => include}/ox/std/defines.hpp | 0 {src => include}/ox/std/errhandling.hpp | 0 {src => include}/ox/std/error.hpp | 0 {src => include}/ox/std/fmt.hpp | 0 {src => include}/ox/std/hardware.hpp | 0 {src => include}/ox/std/hash.hpp | 0 {src => include}/ox/std/hashmap.hpp | 0 {src => include}/ox/std/heapmgr.hpp | 0 {src => include}/ox/std/ignore.hpp | 0 {src => include}/ox/std/initializerlist.hpp | 0 {src => include}/ox/std/istreamreader.hpp | 0 {src => include}/ox/std/istring.hpp | 0 {src => include}/ox/std/iterator.hpp | 0 {src => include}/ox/std/math.hpp | 0 {src => include}/ox/std/maybeview.hpp | 0 {src => include}/ox/std/memops.hpp | 0 {src => include}/ox/std/memory.hpp | 0 {src => include}/ox/std/new.hpp | 0 {src => include}/ox/std/optional.hpp | 0 {src => include}/ox/std/pair.hpp | 0 {src => include}/ox/std/point.hpp | 0 {src => include}/ox/std/random.hpp | 0 {src => include}/ox/std/range.hpp | 0 {src => include}/ox/std/ranges.hpp | 0 {src => include}/ox/std/reader.hpp | 0 {src => include}/ox/std/realstd.hpp | 0 {src => include}/ox/std/serialize.hpp | 0 {src => include}/ox/std/size.hpp | 0 {src => include}/ox/std/smallmap.hpp | 0 {src => include}/ox/std/source_location.hpp | 0 {src => include}/ox/std/span.hpp | 0 {src => include}/ox/std/stacktrace.hpp | 0 {src => include}/ox/std/std.hpp | 0 {src => include}/ox/std/stddef.hpp | 0 {src => include}/ox/std/strconv.hpp | 0 {src => include}/ox/std/string.hpp | 0 {src => include}/ox/std/stringliteral.hpp | 0 {src => include}/ox/std/stringparam.hpp | 0 {src => include}/ox/std/stringview.hpp | 0 {src => include}/ox/std/strongint.hpp | 0 {src => include}/ox/std/strops.hpp | 0 {src => include}/ox/std/trace.hpp | 0 {src => include}/ox/std/typeinfo.hpp | 0 {src => include}/ox/std/types.hpp | 0 {src => include}/ox/std/typetraits.hpp | 0 {src => include}/ox/std/units.hpp | 0 {src => include}/ox/std/utility.hpp | 0 {src => include}/ox/std/uuid.hpp | 0 {src => include}/ox/std/vec.hpp | 0 {src => include}/ox/std/vector.hpp | 0 {src => include}/ox/std/writer.hpp | 0 src/ox/clargs/clargs.cpp | 2 +- src/ox/claw/CMakeLists.txt | 7 +- src/ox/claw/read.cpp | 2 +- src/ox/claw/write.cpp | 2 +- src/ox/event/signal.cpp | 2 +- src/ox/fs/CMakeLists.txt | 25 ------- src/ox/fs/filestore/filestoretemplate.cpp | 2 +- src/ox/fs/filesystem/directory.cpp | 2 +- src/ox/fs/filesystem/filelocation.cpp | 2 +- src/ox/fs/filesystem/filesystem.cpp | 2 +- src/ox/fs/filesystem/passthroughfs.cpp | 2 +- src/ox/fs/filesystem/pathiterator.cpp | 2 +- src/ox/logconn/logconn.cpp | 2 +- src/ox/mc/read.cpp | 2 +- src/ox/mc/write.cpp | 2 +- src/ox/model/desctypes.cpp | 2 +- src/ox/model/descwrite.cpp | 2 +- src/ox/model/modelvalue.cpp | 2 +- src/ox/oc/read.cpp | 2 +- src/ox/oc/write.cpp | 2 +- src/ox/preloader/preloader.cpp | 2 +- src/ox/std/CMakeLists.txt | 74 +++---------------- src/ox/std/assert.cpp | 10 +-- src/ox/std/bit.cpp | 2 +- src/ox/std/buffer.cpp | 4 +- src/ox/std/byteswap.cpp | 2 +- src/ox/std/concepts.cpp | 4 +- src/ox/std/fmt.cpp | 2 +- src/ox/std/heapmgr.cpp | 8 +- src/ox/std/istreamreader.cpp | 6 +- src/ox/std/math.cpp | 2 +- src/ox/std/memops.cpp | 6 +- src/ox/std/random.cpp | 4 +- src/ox/std/stacktrace.cpp | 10 +-- src/ox/std/string.cpp | 2 +- src/ox/std/stringview.cpp | 2 +- src/ox/std/strops.cpp | 6 +- src/ox/std/trace.cpp | 2 +- src/ox/std/tracehook.cpp | 8 +- src/ox/std/typetraits.cpp | 4 +- src/ox/std/uuid.cpp | 2 +- src/ox/std/vec.cpp | 2 +- 161 files changed, 93 insertions(+), 153 deletions(-) rename {src => include}/ox/clargs/clargs.hpp (100%) rename {src => include}/ox/claw/claw.hpp (100%) rename {src => include}/ox/claw/format.hpp (100%) rename {src => include}/ox/claw/read.hpp (100%) rename {src => include}/ox/claw/write.hpp (100%) rename {src => include}/ox/event/event.hpp (100%) rename {src => include}/ox/event/signal.hpp (100%) rename {src => include}/ox/fs/filestore/filestoretemplate.hpp (100%) rename {src => include}/ox/fs/filesystem/directory.hpp (100%) rename {src => include}/ox/fs/filesystem/filelocation.hpp (100%) rename {src => include}/ox/fs/filesystem/filesystem.hpp (100%) rename {src => include}/ox/fs/filesystem/passthroughfs.hpp (100%) rename {src => include}/ox/fs/filesystem/pathiterator.hpp (100%) rename {src => include}/ox/fs/filesystem/types.hpp (100%) rename {src => include}/ox/fs/fs.hpp (100%) rename {src => include}/ox/fs/ptrarith/nodebuffer.hpp (100%) rename {src => include}/ox/fs/ptrarith/ptr.hpp (100%) rename {src => include}/ox/logconn/circularbuff.hpp (100%) rename {src => include}/ox/logconn/def.hpp (100%) rename {src => include}/ox/logconn/logconn.hpp (100%) rename {src => include}/ox/mc/err.hpp (100%) rename {src => include}/ox/mc/intops.hpp (100%) rename {src => include}/ox/mc/mc.hpp (100%) rename {src => include}/ox/mc/presenceindicator.hpp (100%) rename {src => include}/ox/mc/read.hpp (100%) rename {src => include}/ox/mc/types.hpp (100%) rename {src => include}/ox/mc/write.hpp (100%) rename {src => include}/ox/model/def.hpp (100%) create mode 100644 include/ox/model/definition-language.txt rename {src => include}/ox/model/descread.hpp (100%) rename {src => include}/ox/model/desctypes.hpp (100%) rename {src => include}/ox/model/descwrite.hpp (100%) rename {src => include}/ox/model/fieldcounter.hpp (100%) rename {src => include}/ox/model/metadata.hpp (100%) rename {src => include}/ox/model/model.hpp (100%) rename {src => include}/ox/model/modelhandleradaptor.hpp (100%) rename {src => include}/ox/model/modelops.hpp (100%) rename {src => include}/ox/model/modelvalue.hpp (100%) rename {src => include}/ox/model/optype.hpp (100%) rename {src => include}/ox/model/typenamecatcher.hpp (100%) rename {src => include}/ox/model/types.hpp (100%) rename {src => include}/ox/model/typestore.hpp (100%) rename {src => include}/ox/model/walk.hpp (100%) rename {src => include}/ox/oc/oc.hpp (100%) rename {src => include}/ox/oc/read.hpp (100%) rename {src => include}/ox/oc/write.hpp (100%) rename {src => include}/ox/preloader/alignmentcatcher.hpp (100%) rename {src => include}/ox/preloader/platspecs.hpp (100%) rename {src => include}/ox/preloader/preloader.hpp (100%) rename {src => include}/ox/preloader/sizecatcher.hpp (100%) rename {src => include}/ox/preloader/unionsizecatcher.hpp (100%) rename {src => include}/ox/std/algorithm.hpp (100%) rename {src => include}/ox/std/anyptr.hpp (100%) rename {src => include}/ox/std/array.hpp (100%) rename {src => include}/ox/std/assert.hpp (100%) rename {src => include}/ox/std/basestringview.hpp (100%) rename {src => include}/ox/std/bit.hpp (100%) rename {src => include}/ox/std/bounds.hpp (100%) rename {src => include}/ox/std/buffer.hpp (100%) rename {src => include}/ox/std/buildinfo.hpp (100%) rename {src => include}/ox/std/byteswap.hpp (100%) rename {src => include}/ox/std/concepts.hpp (100%) rename {src => include}/ox/std/conv.hpp (100%) rename {src => include}/ox/std/cstringview.hpp (100%) rename {src => include}/ox/std/cstrops.hpp (100%) rename {src => include}/ox/std/def.hpp (100%) rename {src => include}/ox/std/defer.hpp (100%) rename {src => include}/ox/std/defines.hpp (100%) rename {src => include}/ox/std/errhandling.hpp (100%) rename {src => include}/ox/std/error.hpp (100%) rename {src => include}/ox/std/fmt.hpp (100%) rename {src => include}/ox/std/hardware.hpp (100%) rename {src => include}/ox/std/hash.hpp (100%) rename {src => include}/ox/std/hashmap.hpp (100%) rename {src => include}/ox/std/heapmgr.hpp (100%) rename {src => include}/ox/std/ignore.hpp (100%) rename {src => include}/ox/std/initializerlist.hpp (100%) rename {src => include}/ox/std/istreamreader.hpp (100%) rename {src => include}/ox/std/istring.hpp (100%) rename {src => include}/ox/std/iterator.hpp (100%) rename {src => include}/ox/std/math.hpp (100%) rename {src => include}/ox/std/maybeview.hpp (100%) rename {src => include}/ox/std/memops.hpp (100%) rename {src => include}/ox/std/memory.hpp (100%) rename {src => include}/ox/std/new.hpp (100%) rename {src => include}/ox/std/optional.hpp (100%) rename {src => include}/ox/std/pair.hpp (100%) rename {src => include}/ox/std/point.hpp (100%) rename {src => include}/ox/std/random.hpp (100%) rename {src => include}/ox/std/range.hpp (100%) rename {src => include}/ox/std/ranges.hpp (100%) rename {src => include}/ox/std/reader.hpp (100%) rename {src => include}/ox/std/realstd.hpp (100%) rename {src => include}/ox/std/serialize.hpp (100%) rename {src => include}/ox/std/size.hpp (100%) rename {src => include}/ox/std/smallmap.hpp (100%) rename {src => include}/ox/std/source_location.hpp (100%) rename {src => include}/ox/std/span.hpp (100%) rename {src => include}/ox/std/stacktrace.hpp (100%) rename {src => include}/ox/std/std.hpp (100%) rename {src => include}/ox/std/stddef.hpp (100%) rename {src => include}/ox/std/strconv.hpp (100%) rename {src => include}/ox/std/string.hpp (100%) rename {src => include}/ox/std/stringliteral.hpp (100%) rename {src => include}/ox/std/stringparam.hpp (100%) rename {src => include}/ox/std/stringview.hpp (100%) rename {src => include}/ox/std/strongint.hpp (100%) rename {src => include}/ox/std/strops.hpp (100%) rename {src => include}/ox/std/trace.hpp (100%) rename {src => include}/ox/std/typeinfo.hpp (100%) rename {src => include}/ox/std/types.hpp (100%) rename {src => include}/ox/std/typetraits.hpp (100%) rename {src => include}/ox/std/units.hpp (100%) rename {src => include}/ox/std/utility.hpp (100%) rename {src => include}/ox/std/uuid.hpp (100%) rename {src => include}/ox/std/vec.hpp (100%) rename {src => include}/ox/std/vector.hpp (100%) rename {src => include}/ox/std/writer.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a378f2a4c..15b2d582c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,13 @@ include_directories(src) install(FILES OxConfig.cmake DESTINATION lib/cmake/ox) +install( + DIRECTORY + include/ox + DESTINATION + include +) + if(OX_USE_STDLIB) set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include") add_subdirectory(deps/jsoncpp) diff --git a/src/ox/clargs/clargs.hpp b/include/ox/clargs/clargs.hpp similarity index 100% rename from src/ox/clargs/clargs.hpp rename to include/ox/clargs/clargs.hpp diff --git a/src/ox/claw/claw.hpp b/include/ox/claw/claw.hpp similarity index 100% rename from src/ox/claw/claw.hpp rename to include/ox/claw/claw.hpp diff --git a/src/ox/claw/format.hpp b/include/ox/claw/format.hpp similarity index 100% rename from src/ox/claw/format.hpp rename to include/ox/claw/format.hpp diff --git a/src/ox/claw/read.hpp b/include/ox/claw/read.hpp similarity index 100% rename from src/ox/claw/read.hpp rename to include/ox/claw/read.hpp diff --git a/src/ox/claw/write.hpp b/include/ox/claw/write.hpp similarity index 100% rename from src/ox/claw/write.hpp rename to include/ox/claw/write.hpp diff --git a/src/ox/event/event.hpp b/include/ox/event/event.hpp similarity index 100% rename from src/ox/event/event.hpp rename to include/ox/event/event.hpp diff --git a/src/ox/event/signal.hpp b/include/ox/event/signal.hpp similarity index 100% rename from src/ox/event/signal.hpp rename to include/ox/event/signal.hpp diff --git a/src/ox/fs/filestore/filestoretemplate.hpp b/include/ox/fs/filestore/filestoretemplate.hpp similarity index 100% rename from src/ox/fs/filestore/filestoretemplate.hpp rename to include/ox/fs/filestore/filestoretemplate.hpp diff --git a/src/ox/fs/filesystem/directory.hpp b/include/ox/fs/filesystem/directory.hpp similarity index 100% rename from src/ox/fs/filesystem/directory.hpp rename to include/ox/fs/filesystem/directory.hpp diff --git a/src/ox/fs/filesystem/filelocation.hpp b/include/ox/fs/filesystem/filelocation.hpp similarity index 100% rename from src/ox/fs/filesystem/filelocation.hpp rename to include/ox/fs/filesystem/filelocation.hpp diff --git a/src/ox/fs/filesystem/filesystem.hpp b/include/ox/fs/filesystem/filesystem.hpp similarity index 100% rename from src/ox/fs/filesystem/filesystem.hpp rename to include/ox/fs/filesystem/filesystem.hpp diff --git a/src/ox/fs/filesystem/passthroughfs.hpp b/include/ox/fs/filesystem/passthroughfs.hpp similarity index 100% rename from src/ox/fs/filesystem/passthroughfs.hpp rename to include/ox/fs/filesystem/passthroughfs.hpp diff --git a/src/ox/fs/filesystem/pathiterator.hpp b/include/ox/fs/filesystem/pathiterator.hpp similarity index 100% rename from src/ox/fs/filesystem/pathiterator.hpp rename to include/ox/fs/filesystem/pathiterator.hpp diff --git a/src/ox/fs/filesystem/types.hpp b/include/ox/fs/filesystem/types.hpp similarity index 100% rename from src/ox/fs/filesystem/types.hpp rename to include/ox/fs/filesystem/types.hpp diff --git a/src/ox/fs/fs.hpp b/include/ox/fs/fs.hpp similarity index 100% rename from src/ox/fs/fs.hpp rename to include/ox/fs/fs.hpp diff --git a/src/ox/fs/ptrarith/nodebuffer.hpp b/include/ox/fs/ptrarith/nodebuffer.hpp similarity index 100% rename from src/ox/fs/ptrarith/nodebuffer.hpp rename to include/ox/fs/ptrarith/nodebuffer.hpp diff --git a/src/ox/fs/ptrarith/ptr.hpp b/include/ox/fs/ptrarith/ptr.hpp similarity index 100% rename from src/ox/fs/ptrarith/ptr.hpp rename to include/ox/fs/ptrarith/ptr.hpp diff --git a/src/ox/logconn/circularbuff.hpp b/include/ox/logconn/circularbuff.hpp similarity index 100% rename from src/ox/logconn/circularbuff.hpp rename to include/ox/logconn/circularbuff.hpp diff --git a/src/ox/logconn/def.hpp b/include/ox/logconn/def.hpp similarity index 100% rename from src/ox/logconn/def.hpp rename to include/ox/logconn/def.hpp diff --git a/src/ox/logconn/logconn.hpp b/include/ox/logconn/logconn.hpp similarity index 100% rename from src/ox/logconn/logconn.hpp rename to include/ox/logconn/logconn.hpp diff --git a/src/ox/mc/err.hpp b/include/ox/mc/err.hpp similarity index 100% rename from src/ox/mc/err.hpp rename to include/ox/mc/err.hpp diff --git a/src/ox/mc/intops.hpp b/include/ox/mc/intops.hpp similarity index 100% rename from src/ox/mc/intops.hpp rename to include/ox/mc/intops.hpp diff --git a/src/ox/mc/mc.hpp b/include/ox/mc/mc.hpp similarity index 100% rename from src/ox/mc/mc.hpp rename to include/ox/mc/mc.hpp diff --git a/src/ox/mc/presenceindicator.hpp b/include/ox/mc/presenceindicator.hpp similarity index 100% rename from src/ox/mc/presenceindicator.hpp rename to include/ox/mc/presenceindicator.hpp diff --git a/src/ox/mc/read.hpp b/include/ox/mc/read.hpp similarity index 100% rename from src/ox/mc/read.hpp rename to include/ox/mc/read.hpp diff --git a/src/ox/mc/types.hpp b/include/ox/mc/types.hpp similarity index 100% rename from src/ox/mc/types.hpp rename to include/ox/mc/types.hpp diff --git a/src/ox/mc/write.hpp b/include/ox/mc/write.hpp similarity index 100% rename from src/ox/mc/write.hpp rename to include/ox/mc/write.hpp diff --git a/src/ox/model/def.hpp b/include/ox/model/def.hpp similarity index 100% rename from src/ox/model/def.hpp rename to include/ox/model/def.hpp diff --git a/include/ox/model/definition-language.txt b/include/ox/model/definition-language.txt new file mode 100644 index 000000000..70a40807a --- /dev/null +++ b/include/ox/model/definition-language.txt @@ -0,0 +1,7 @@ + : + : | + : + : | + : + : <0: single> | <1: list> + : diff --git a/src/ox/model/descread.hpp b/include/ox/model/descread.hpp similarity index 100% rename from src/ox/model/descread.hpp rename to include/ox/model/descread.hpp diff --git a/src/ox/model/desctypes.hpp b/include/ox/model/desctypes.hpp similarity index 100% rename from src/ox/model/desctypes.hpp rename to include/ox/model/desctypes.hpp diff --git a/src/ox/model/descwrite.hpp b/include/ox/model/descwrite.hpp similarity index 100% rename from src/ox/model/descwrite.hpp rename to include/ox/model/descwrite.hpp diff --git a/src/ox/model/fieldcounter.hpp b/include/ox/model/fieldcounter.hpp similarity index 100% rename from src/ox/model/fieldcounter.hpp rename to include/ox/model/fieldcounter.hpp diff --git a/src/ox/model/metadata.hpp b/include/ox/model/metadata.hpp similarity index 100% rename from src/ox/model/metadata.hpp rename to include/ox/model/metadata.hpp diff --git a/src/ox/model/model.hpp b/include/ox/model/model.hpp similarity index 100% rename from src/ox/model/model.hpp rename to include/ox/model/model.hpp diff --git a/src/ox/model/modelhandleradaptor.hpp b/include/ox/model/modelhandleradaptor.hpp similarity index 100% rename from src/ox/model/modelhandleradaptor.hpp rename to include/ox/model/modelhandleradaptor.hpp diff --git a/src/ox/model/modelops.hpp b/include/ox/model/modelops.hpp similarity index 100% rename from src/ox/model/modelops.hpp rename to include/ox/model/modelops.hpp diff --git a/src/ox/model/modelvalue.hpp b/include/ox/model/modelvalue.hpp similarity index 100% rename from src/ox/model/modelvalue.hpp rename to include/ox/model/modelvalue.hpp diff --git a/src/ox/model/optype.hpp b/include/ox/model/optype.hpp similarity index 100% rename from src/ox/model/optype.hpp rename to include/ox/model/optype.hpp diff --git a/src/ox/model/typenamecatcher.hpp b/include/ox/model/typenamecatcher.hpp similarity index 100% rename from src/ox/model/typenamecatcher.hpp rename to include/ox/model/typenamecatcher.hpp diff --git a/src/ox/model/types.hpp b/include/ox/model/types.hpp similarity index 100% rename from src/ox/model/types.hpp rename to include/ox/model/types.hpp diff --git a/src/ox/model/typestore.hpp b/include/ox/model/typestore.hpp similarity index 100% rename from src/ox/model/typestore.hpp rename to include/ox/model/typestore.hpp diff --git a/src/ox/model/walk.hpp b/include/ox/model/walk.hpp similarity index 100% rename from src/ox/model/walk.hpp rename to include/ox/model/walk.hpp diff --git a/src/ox/oc/oc.hpp b/include/ox/oc/oc.hpp similarity index 100% rename from src/ox/oc/oc.hpp rename to include/ox/oc/oc.hpp diff --git a/src/ox/oc/read.hpp b/include/ox/oc/read.hpp similarity index 100% rename from src/ox/oc/read.hpp rename to include/ox/oc/read.hpp diff --git a/src/ox/oc/write.hpp b/include/ox/oc/write.hpp similarity index 100% rename from src/ox/oc/write.hpp rename to include/ox/oc/write.hpp diff --git a/src/ox/preloader/alignmentcatcher.hpp b/include/ox/preloader/alignmentcatcher.hpp similarity index 100% rename from src/ox/preloader/alignmentcatcher.hpp rename to include/ox/preloader/alignmentcatcher.hpp diff --git a/src/ox/preloader/platspecs.hpp b/include/ox/preloader/platspecs.hpp similarity index 100% rename from src/ox/preloader/platspecs.hpp rename to include/ox/preloader/platspecs.hpp diff --git a/src/ox/preloader/preloader.hpp b/include/ox/preloader/preloader.hpp similarity index 100% rename from src/ox/preloader/preloader.hpp rename to include/ox/preloader/preloader.hpp diff --git a/src/ox/preloader/sizecatcher.hpp b/include/ox/preloader/sizecatcher.hpp similarity index 100% rename from src/ox/preloader/sizecatcher.hpp rename to include/ox/preloader/sizecatcher.hpp diff --git a/src/ox/preloader/unionsizecatcher.hpp b/include/ox/preloader/unionsizecatcher.hpp similarity index 100% rename from src/ox/preloader/unionsizecatcher.hpp rename to include/ox/preloader/unionsizecatcher.hpp diff --git a/src/ox/std/algorithm.hpp b/include/ox/std/algorithm.hpp similarity index 100% rename from src/ox/std/algorithm.hpp rename to include/ox/std/algorithm.hpp diff --git a/src/ox/std/anyptr.hpp b/include/ox/std/anyptr.hpp similarity index 100% rename from src/ox/std/anyptr.hpp rename to include/ox/std/anyptr.hpp diff --git a/src/ox/std/array.hpp b/include/ox/std/array.hpp similarity index 100% rename from src/ox/std/array.hpp rename to include/ox/std/array.hpp diff --git a/src/ox/std/assert.hpp b/include/ox/std/assert.hpp similarity index 100% rename from src/ox/std/assert.hpp rename to include/ox/std/assert.hpp diff --git a/src/ox/std/basestringview.hpp b/include/ox/std/basestringview.hpp similarity index 100% rename from src/ox/std/basestringview.hpp rename to include/ox/std/basestringview.hpp diff --git a/src/ox/std/bit.hpp b/include/ox/std/bit.hpp similarity index 100% rename from src/ox/std/bit.hpp rename to include/ox/std/bit.hpp diff --git a/src/ox/std/bounds.hpp b/include/ox/std/bounds.hpp similarity index 100% rename from src/ox/std/bounds.hpp rename to include/ox/std/bounds.hpp diff --git a/src/ox/std/buffer.hpp b/include/ox/std/buffer.hpp similarity index 100% rename from src/ox/std/buffer.hpp rename to include/ox/std/buffer.hpp diff --git a/src/ox/std/buildinfo.hpp b/include/ox/std/buildinfo.hpp similarity index 100% rename from src/ox/std/buildinfo.hpp rename to include/ox/std/buildinfo.hpp diff --git a/src/ox/std/byteswap.hpp b/include/ox/std/byteswap.hpp similarity index 100% rename from src/ox/std/byteswap.hpp rename to include/ox/std/byteswap.hpp diff --git a/src/ox/std/concepts.hpp b/include/ox/std/concepts.hpp similarity index 100% rename from src/ox/std/concepts.hpp rename to include/ox/std/concepts.hpp diff --git a/src/ox/std/conv.hpp b/include/ox/std/conv.hpp similarity index 100% rename from src/ox/std/conv.hpp rename to include/ox/std/conv.hpp diff --git a/src/ox/std/cstringview.hpp b/include/ox/std/cstringview.hpp similarity index 100% rename from src/ox/std/cstringview.hpp rename to include/ox/std/cstringview.hpp diff --git a/src/ox/std/cstrops.hpp b/include/ox/std/cstrops.hpp similarity index 100% rename from src/ox/std/cstrops.hpp rename to include/ox/std/cstrops.hpp diff --git a/src/ox/std/def.hpp b/include/ox/std/def.hpp similarity index 100% rename from src/ox/std/def.hpp rename to include/ox/std/def.hpp diff --git a/src/ox/std/defer.hpp b/include/ox/std/defer.hpp similarity index 100% rename from src/ox/std/defer.hpp rename to include/ox/std/defer.hpp diff --git a/src/ox/std/defines.hpp b/include/ox/std/defines.hpp similarity index 100% rename from src/ox/std/defines.hpp rename to include/ox/std/defines.hpp diff --git a/src/ox/std/errhandling.hpp b/include/ox/std/errhandling.hpp similarity index 100% rename from src/ox/std/errhandling.hpp rename to include/ox/std/errhandling.hpp diff --git a/src/ox/std/error.hpp b/include/ox/std/error.hpp similarity index 100% rename from src/ox/std/error.hpp rename to include/ox/std/error.hpp diff --git a/src/ox/std/fmt.hpp b/include/ox/std/fmt.hpp similarity index 100% rename from src/ox/std/fmt.hpp rename to include/ox/std/fmt.hpp diff --git a/src/ox/std/hardware.hpp b/include/ox/std/hardware.hpp similarity index 100% rename from src/ox/std/hardware.hpp rename to include/ox/std/hardware.hpp diff --git a/src/ox/std/hash.hpp b/include/ox/std/hash.hpp similarity index 100% rename from src/ox/std/hash.hpp rename to include/ox/std/hash.hpp diff --git a/src/ox/std/hashmap.hpp b/include/ox/std/hashmap.hpp similarity index 100% rename from src/ox/std/hashmap.hpp rename to include/ox/std/hashmap.hpp diff --git a/src/ox/std/heapmgr.hpp b/include/ox/std/heapmgr.hpp similarity index 100% rename from src/ox/std/heapmgr.hpp rename to include/ox/std/heapmgr.hpp diff --git a/src/ox/std/ignore.hpp b/include/ox/std/ignore.hpp similarity index 100% rename from src/ox/std/ignore.hpp rename to include/ox/std/ignore.hpp diff --git a/src/ox/std/initializerlist.hpp b/include/ox/std/initializerlist.hpp similarity index 100% rename from src/ox/std/initializerlist.hpp rename to include/ox/std/initializerlist.hpp diff --git a/src/ox/std/istreamreader.hpp b/include/ox/std/istreamreader.hpp similarity index 100% rename from src/ox/std/istreamreader.hpp rename to include/ox/std/istreamreader.hpp diff --git a/src/ox/std/istring.hpp b/include/ox/std/istring.hpp similarity index 100% rename from src/ox/std/istring.hpp rename to include/ox/std/istring.hpp diff --git a/src/ox/std/iterator.hpp b/include/ox/std/iterator.hpp similarity index 100% rename from src/ox/std/iterator.hpp rename to include/ox/std/iterator.hpp diff --git a/src/ox/std/math.hpp b/include/ox/std/math.hpp similarity index 100% rename from src/ox/std/math.hpp rename to include/ox/std/math.hpp diff --git a/src/ox/std/maybeview.hpp b/include/ox/std/maybeview.hpp similarity index 100% rename from src/ox/std/maybeview.hpp rename to include/ox/std/maybeview.hpp diff --git a/src/ox/std/memops.hpp b/include/ox/std/memops.hpp similarity index 100% rename from src/ox/std/memops.hpp rename to include/ox/std/memops.hpp diff --git a/src/ox/std/memory.hpp b/include/ox/std/memory.hpp similarity index 100% rename from src/ox/std/memory.hpp rename to include/ox/std/memory.hpp diff --git a/src/ox/std/new.hpp b/include/ox/std/new.hpp similarity index 100% rename from src/ox/std/new.hpp rename to include/ox/std/new.hpp diff --git a/src/ox/std/optional.hpp b/include/ox/std/optional.hpp similarity index 100% rename from src/ox/std/optional.hpp rename to include/ox/std/optional.hpp diff --git a/src/ox/std/pair.hpp b/include/ox/std/pair.hpp similarity index 100% rename from src/ox/std/pair.hpp rename to include/ox/std/pair.hpp diff --git a/src/ox/std/point.hpp b/include/ox/std/point.hpp similarity index 100% rename from src/ox/std/point.hpp rename to include/ox/std/point.hpp diff --git a/src/ox/std/random.hpp b/include/ox/std/random.hpp similarity index 100% rename from src/ox/std/random.hpp rename to include/ox/std/random.hpp diff --git a/src/ox/std/range.hpp b/include/ox/std/range.hpp similarity index 100% rename from src/ox/std/range.hpp rename to include/ox/std/range.hpp diff --git a/src/ox/std/ranges.hpp b/include/ox/std/ranges.hpp similarity index 100% rename from src/ox/std/ranges.hpp rename to include/ox/std/ranges.hpp diff --git a/src/ox/std/reader.hpp b/include/ox/std/reader.hpp similarity index 100% rename from src/ox/std/reader.hpp rename to include/ox/std/reader.hpp diff --git a/src/ox/std/realstd.hpp b/include/ox/std/realstd.hpp similarity index 100% rename from src/ox/std/realstd.hpp rename to include/ox/std/realstd.hpp diff --git a/src/ox/std/serialize.hpp b/include/ox/std/serialize.hpp similarity index 100% rename from src/ox/std/serialize.hpp rename to include/ox/std/serialize.hpp diff --git a/src/ox/std/size.hpp b/include/ox/std/size.hpp similarity index 100% rename from src/ox/std/size.hpp rename to include/ox/std/size.hpp diff --git a/src/ox/std/smallmap.hpp b/include/ox/std/smallmap.hpp similarity index 100% rename from src/ox/std/smallmap.hpp rename to include/ox/std/smallmap.hpp diff --git a/src/ox/std/source_location.hpp b/include/ox/std/source_location.hpp similarity index 100% rename from src/ox/std/source_location.hpp rename to include/ox/std/source_location.hpp diff --git a/src/ox/std/span.hpp b/include/ox/std/span.hpp similarity index 100% rename from src/ox/std/span.hpp rename to include/ox/std/span.hpp diff --git a/src/ox/std/stacktrace.hpp b/include/ox/std/stacktrace.hpp similarity index 100% rename from src/ox/std/stacktrace.hpp rename to include/ox/std/stacktrace.hpp diff --git a/src/ox/std/std.hpp b/include/ox/std/std.hpp similarity index 100% rename from src/ox/std/std.hpp rename to include/ox/std/std.hpp diff --git a/src/ox/std/stddef.hpp b/include/ox/std/stddef.hpp similarity index 100% rename from src/ox/std/stddef.hpp rename to include/ox/std/stddef.hpp diff --git a/src/ox/std/strconv.hpp b/include/ox/std/strconv.hpp similarity index 100% rename from src/ox/std/strconv.hpp rename to include/ox/std/strconv.hpp diff --git a/src/ox/std/string.hpp b/include/ox/std/string.hpp similarity index 100% rename from src/ox/std/string.hpp rename to include/ox/std/string.hpp diff --git a/src/ox/std/stringliteral.hpp b/include/ox/std/stringliteral.hpp similarity index 100% rename from src/ox/std/stringliteral.hpp rename to include/ox/std/stringliteral.hpp diff --git a/src/ox/std/stringparam.hpp b/include/ox/std/stringparam.hpp similarity index 100% rename from src/ox/std/stringparam.hpp rename to include/ox/std/stringparam.hpp diff --git a/src/ox/std/stringview.hpp b/include/ox/std/stringview.hpp similarity index 100% rename from src/ox/std/stringview.hpp rename to include/ox/std/stringview.hpp diff --git a/src/ox/std/strongint.hpp b/include/ox/std/strongint.hpp similarity index 100% rename from src/ox/std/strongint.hpp rename to include/ox/std/strongint.hpp diff --git a/src/ox/std/strops.hpp b/include/ox/std/strops.hpp similarity index 100% rename from src/ox/std/strops.hpp rename to include/ox/std/strops.hpp diff --git a/src/ox/std/trace.hpp b/include/ox/std/trace.hpp similarity index 100% rename from src/ox/std/trace.hpp rename to include/ox/std/trace.hpp diff --git a/src/ox/std/typeinfo.hpp b/include/ox/std/typeinfo.hpp similarity index 100% rename from src/ox/std/typeinfo.hpp rename to include/ox/std/typeinfo.hpp diff --git a/src/ox/std/types.hpp b/include/ox/std/types.hpp similarity index 100% rename from src/ox/std/types.hpp rename to include/ox/std/types.hpp diff --git a/src/ox/std/typetraits.hpp b/include/ox/std/typetraits.hpp similarity index 100% rename from src/ox/std/typetraits.hpp rename to include/ox/std/typetraits.hpp diff --git a/src/ox/std/units.hpp b/include/ox/std/units.hpp similarity index 100% rename from src/ox/std/units.hpp rename to include/ox/std/units.hpp diff --git a/src/ox/std/utility.hpp b/include/ox/std/utility.hpp similarity index 100% rename from src/ox/std/utility.hpp rename to include/ox/std/utility.hpp diff --git a/src/ox/std/uuid.hpp b/include/ox/std/uuid.hpp similarity index 100% rename from src/ox/std/uuid.hpp rename to include/ox/std/uuid.hpp diff --git a/src/ox/std/vec.hpp b/include/ox/std/vec.hpp similarity index 100% rename from src/ox/std/vec.hpp rename to include/ox/std/vec.hpp diff --git a/src/ox/std/vector.hpp b/include/ox/std/vector.hpp similarity index 100% rename from src/ox/std/vector.hpp rename to include/ox/std/vector.hpp diff --git a/src/ox/std/writer.hpp b/include/ox/std/writer.hpp similarity index 100% rename from src/ox/std/writer.hpp rename to include/ox/std/writer.hpp diff --git a/src/ox/clargs/clargs.cpp b/src/ox/clargs/clargs.cpp index 1976f25f9..e779e4151 100644 --- a/src/ox/clargs/clargs.cpp +++ b/src/ox/clargs/clargs.cpp @@ -7,7 +7,7 @@ */ #include -#include "clargs.hpp" +#include namespace ox { diff --git a/src/ox/claw/CMakeLists.txt b/src/ox/claw/CMakeLists.txt index 4c13e5b07..7ddf44868 100644 --- a/src/ox/claw/CMakeLists.txt +++ b/src/ox/claw/CMakeLists.txt @@ -27,9 +27,10 @@ target_link_libraries( # ) #endif() -install(TARGETS OxClaw - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +install( + TARGETS OxClaw + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/src/ox/claw/read.cpp b/src/ox/claw/read.cpp index 8e12ebfc4..6f94e924b 100644 --- a/src/ox/claw/read.cpp +++ b/src/ox/claw/read.cpp @@ -8,7 +8,7 @@ #include -#include "read.hpp" +#include namespace ox { diff --git a/src/ox/claw/write.cpp b/src/ox/claw/write.cpp index c184be236..87858396b 100644 --- a/src/ox/claw/write.cpp +++ b/src/ox/claw/write.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "write.hpp" +#include namespace ox::detail { diff --git a/src/ox/event/signal.cpp b/src/ox/event/signal.cpp index a0928f6a3..69cb12cb8 100644 --- a/src/ox/event/signal.cpp +++ b/src/ox/event/signal.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "signal.hpp" +#include namespace ox { diff --git a/src/ox/fs/CMakeLists.txt b/src/ox/fs/CMakeLists.txt index 960f7c646..7adfa2397 100644 --- a/src/ox/fs/CMakeLists.txt +++ b/src/ox/fs/CMakeLists.txt @@ -5,8 +5,6 @@ endif() add_library( OxFS - ptrarith/nodebuffer.hpp - ptrarith/ptr.hpp filestore/filestoretemplate.cpp filesystem/filelocation.cpp filesystem/pathiterator.cpp @@ -52,29 +50,6 @@ if(NOT OX_BARE_METAL) ) endif() -install( - FILES - filestore/filestoretemplate.hpp - DESTINATION - include/ox/fs/filestore -) - -install( - FILES - filesystem/filesystem.hpp - filesystem/pathiterator.hpp - DESTINATION - include/ox/fs/filesystem -) - -install( - FILES - ptrarith/nodebuffer.hpp - ptrarith/ptr.hpp - DESTINATION - include/ox/fs/ptrarith -) - install( TARGETS OxFS diff --git a/src/ox/fs/filestore/filestoretemplate.cpp b/src/ox/fs/filestore/filestoretemplate.cpp index 3e3a638c0..89e586ab4 100644 --- a/src/ox/fs/filestore/filestoretemplate.cpp +++ b/src/ox/fs/filestore/filestoretemplate.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "filestoretemplate.hpp" +#include namespace ox { diff --git a/src/ox/fs/filesystem/directory.cpp b/src/ox/fs/filesystem/directory.cpp index 648a3f1ae..9025d4062 100644 --- a/src/ox/fs/filesystem/directory.cpp +++ b/src/ox/fs/filesystem/directory.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "directory.hpp" +#include namespace ox { diff --git a/src/ox/fs/filesystem/filelocation.cpp b/src/ox/fs/filesystem/filelocation.cpp index a7b9d71ea..6ef96d7be 100644 --- a/src/ox/fs/filesystem/filelocation.cpp +++ b/src/ox/fs/filesystem/filelocation.cpp @@ -8,7 +8,7 @@ #include -#include "filelocation.hpp" +#include namespace ox { diff --git a/src/ox/fs/filesystem/filesystem.cpp b/src/ox/fs/filesystem/filesystem.cpp index 07e2c390b..da0e0844e 100644 --- a/src/ox/fs/filesystem/filesystem.cpp +++ b/src/ox/fs/filesystem/filesystem.cpp @@ -9,7 +9,7 @@ #include #include -#include "filesystem.hpp" +#include namespace ox { diff --git a/src/ox/fs/filesystem/passthroughfs.cpp b/src/ox/fs/filesystem/passthroughfs.cpp index f7cab7d9a..22489c5bc 100644 --- a/src/ox/fs/filesystem/passthroughfs.cpp +++ b/src/ox/fs/filesystem/passthroughfs.cpp @@ -8,7 +8,7 @@ #include -#include "passthroughfs.hpp" +#include #if defined(OX_HAS_PASSTHROUGHFS) diff --git a/src/ox/fs/filesystem/pathiterator.cpp b/src/ox/fs/filesystem/pathiterator.cpp index 39cf99aa4..d6205f86a 100644 --- a/src/ox/fs/filesystem/pathiterator.cpp +++ b/src/ox/fs/filesystem/pathiterator.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "pathiterator.hpp" +#include OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) diff --git a/src/ox/logconn/logconn.cpp b/src/ox/logconn/logconn.cpp index d101e6180..8d1ff71cf 100644 --- a/src/ox/logconn/logconn.cpp +++ b/src/ox/logconn/logconn.cpp @@ -23,7 +23,7 @@ #endif -#include "logconn.hpp" +#include namespace ox { diff --git a/src/ox/mc/read.cpp b/src/ox/mc/read.cpp index de3e6038c..8a77c0e34 100644 --- a/src/ox/mc/read.cpp +++ b/src/ox/mc/read.cpp @@ -10,7 +10,7 @@ #include #include -#include "read.hpp" +#include namespace ox { diff --git a/src/ox/mc/write.cpp b/src/ox/mc/write.cpp index 80dea56f8..cc5fd9d7d 100644 --- a/src/ox/mc/write.cpp +++ b/src/ox/mc/write.cpp @@ -11,7 +11,7 @@ #include #include -#include "write.hpp" +#include namespace ox { diff --git a/src/ox/model/desctypes.cpp b/src/ox/model/desctypes.cpp index f04b9061e..5f9132557 100644 --- a/src/ox/model/desctypes.cpp +++ b/src/ox/model/desctypes.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "desctypes.hpp" +#include namespace ox { diff --git a/src/ox/model/descwrite.cpp b/src/ox/model/descwrite.cpp index 9421d513f..fcba2b508 100644 --- a/src/ox/model/descwrite.cpp +++ b/src/ox/model/descwrite.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "descwrite.hpp" +#include namespace ox { diff --git a/src/ox/model/modelvalue.cpp b/src/ox/model/modelvalue.cpp index ea3136cc5..759c3566d 100644 --- a/src/ox/model/modelvalue.cpp +++ b/src/ox/model/modelvalue.cpp @@ -8,7 +8,7 @@ #include -#include "modelvalue.hpp" +#include namespace ox { diff --git a/src/ox/oc/read.cpp b/src/ox/oc/read.cpp index d20749f93..e6d6c7d4f 100644 --- a/src/ox/oc/read.cpp +++ b/src/ox/oc/read.cpp @@ -9,7 +9,7 @@ #include #include -#include "read.hpp" +#include namespace ox { diff --git a/src/ox/oc/write.cpp b/src/ox/oc/write.cpp index 618b930f8..189d747a6 100644 --- a/src/ox/oc/write.cpp +++ b/src/ox/oc/write.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "write.hpp" +#include namespace ox { diff --git a/src/ox/preloader/preloader.cpp b/src/ox/preloader/preloader.cpp index 732df2927..b428bb5de 100644 --- a/src/ox/preloader/preloader.cpp +++ b/src/ox/preloader/preloader.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "preloader.hpp" +#include namespace ox { diff --git a/src/ox/std/CMakeLists.txt b/src/ox/std/CMakeLists.txt index 0c8f27d00..2873bd43f 100644 --- a/src/ox/std/CMakeLists.txt +++ b/src/ox/std/CMakeLists.txt @@ -91,70 +91,20 @@ target_link_libraries( CityHash ) -install( - FILES - algorithm.hpp - array.hpp - assert.hpp - bit.hpp - bounds.hpp - istring.hpp - buffer.hpp - buildinfo.hpp - byteswap.hpp - concepts.hpp - conv.hpp - def.hpp - defer.hpp - defines.hpp - errhandling.hpp - error.hpp - fmt.hpp - hardware.hpp - hash.hpp - hashmap.hpp - heapmgr.hpp - ignore.hpp - iterator.hpp - math.hpp - maybeview.hpp - memops.hpp - memory.hpp - new.hpp - optional.hpp - pair.hpp - point.hpp - random.hpp - ranges.hpp - serialize.hpp - size.hpp - smallmap.hpp - stacktrace.hpp - std.hpp - stddef.hpp - string.hpp - stringliteral.hpp - stringview.hpp - strongint.hpp - strconv.hpp - stringparam.hpp - strops.hpp - trace.hpp - typeinfo.hpp - types.hpp - typetraits.hpp - units.hpp - uuid.hpp - vec.hpp - vector.hpp - writer.hpp - DESTINATION - include/ox/std +target_include_directories( + OxStd PUBLIC + ../../../include ) -install(TARGETS OxStd OxTraceHook - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +target_include_directories( + OxTraceHook PUBLIC + ../../../include +) + +install( + TARGETS OxStd OxTraceHook + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/src/ox/std/assert.cpp b/src/ox/std/assert.cpp index d63a796da..0d5ee7ff0 100644 --- a/src/ox/std/assert.cpp +++ b/src/ox/std/assert.cpp @@ -6,12 +6,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "fmt.hpp" -#include "realstd.hpp" -#include "stacktrace.hpp" -#include "trace.hpp" +#include +#include +#include +#include -#include "assert.hpp" +#include namespace ox { diff --git a/src/ox/std/bit.cpp b/src/ox/std/bit.cpp index 24600afed..1d15a679b 100644 --- a/src/ox/std/bit.cpp +++ b/src/ox/std/bit.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "bit.hpp" +#include static_assert(ox::onMask(1) == 0b0001); static_assert(ox::onMask(2) == 0b0011); diff --git a/src/ox/std/buffer.cpp b/src/ox/std/buffer.cpp index b15548c3a..9794ced80 100644 --- a/src/ox/std/buffer.cpp +++ b/src/ox/std/buffer.cpp @@ -6,8 +6,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "error.hpp" -#include "buffer.hpp" +#include +#include namespace ox { diff --git a/src/ox/std/byteswap.cpp b/src/ox/std/byteswap.cpp index 85963cb49..f4141e31c 100644 --- a/src/ox/std/byteswap.cpp +++ b/src/ox/std/byteswap.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "byteswap.hpp" +#include namespace ox { diff --git a/src/ox/std/concepts.cpp b/src/ox/std/concepts.cpp index e6314cf80..8ed94986b 100644 --- a/src/ox/std/concepts.cpp +++ b/src/ox/std/concepts.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "concepts.hpp" +#include namespace ox::detail::test { @@ -20,4 +20,4 @@ static_assert(ok(static_cast(nullptr))); static_assert(!ok(static_cast(nullptr))); static_assert(!ok(static_cast(nullptr))); -} \ No newline at end of file +} diff --git a/src/ox/std/fmt.cpp b/src/ox/std/fmt.cpp index 7abf8c8aa..0d7b8c4ba 100644 --- a/src/ox/std/fmt.cpp +++ b/src/ox/std/fmt.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "fmt.hpp" +#include namespace ox::detail { diff --git a/src/ox/std/heapmgr.cpp b/src/ox/std/heapmgr.cpp index 90e9f19c1..a84a9cb3e 100644 --- a/src/ox/std/heapmgr.cpp +++ b/src/ox/std/heapmgr.cpp @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "assert.hpp" -#include "bit.hpp" -#include "def.hpp" -#include "heapmgr.hpp" +#include +#include +#include +#include OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) diff --git a/src/ox/std/istreamreader.cpp b/src/ox/std/istreamreader.cpp index 3eaa94180..b1988ac92 100644 --- a/src/ox/std/istreamreader.cpp +++ b/src/ox/std/istreamreader.cpp @@ -10,9 +10,9 @@ #ifdef OX_USE_STDLIB #include -#include "array.hpp" -#include "reader.hpp" -#include "istreamreader.hpp" +#include +#include +#include namespace ox { diff --git a/src/ox/std/math.cpp b/src/ox/std/math.cpp index 962bbed3c..2816eb5a5 100644 --- a/src/ox/std/math.cpp +++ b/src/ox/std/math.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "math.hpp" +#include namespace ox { diff --git a/src/ox/std/memops.cpp b/src/ox/std/memops.cpp index 06b9ad5c2..22e33dc23 100644 --- a/src/ox/std/memops.cpp +++ b/src/ox/std/memops.cpp @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "defines.hpp" -#include "types.hpp" -#include "memops.hpp" +#include +#include +#include OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) diff --git a/src/ox/std/random.cpp b/src/ox/std/random.cpp index 53c27d34e..0b4204f97 100644 --- a/src/ox/std/random.cpp +++ b/src/ox/std/random.cpp @@ -6,8 +6,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "bit.hpp" -#include "random.hpp" +#include +#include namespace ox { diff --git a/src/ox/std/stacktrace.cpp b/src/ox/std/stacktrace.cpp index ae4d3d1c9..436b2153b 100644 --- a/src/ox/std/stacktrace.cpp +++ b/src/ox/std/stacktrace.cpp @@ -18,11 +18,11 @@ #endif #endif -#include "def.hpp" -#include "defines.hpp" -#include "string.hpp" -#include "trace.hpp" -#include "vector.hpp" +#include +#include +#include +#include +#include OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) diff --git a/src/ox/std/string.cpp b/src/ox/std/string.cpp index ff43e3caf..856393280 100644 --- a/src/ox/std/string.cpp +++ b/src/ox/std/string.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "string.hpp" +#include namespace ox { diff --git a/src/ox/std/stringview.cpp b/src/ox/std/stringview.cpp index b71f116f3..8eb523224 100644 --- a/src/ox/std/stringview.cpp +++ b/src/ox/std/stringview.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "stringview.hpp" +#include static_assert(ox::StringView("Read").bytes() == 4); static_assert(ox::StringView("Read") == ox::StringView("Read")); diff --git a/src/ox/std/strops.cpp b/src/ox/std/strops.cpp index b08988e10..41e87fdc2 100644 --- a/src/ox/std/strops.cpp +++ b/src/ox/std/strops.cpp @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "def.hpp" -#include "span.hpp" -#include "strops.hpp" +#include +#include +#include static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk"); diff --git a/src/ox/std/trace.cpp b/src/ox/std/trace.cpp index bb43e4bc2..d360c7d24 100644 --- a/src/ox/std/trace.cpp +++ b/src/ox/std/trace.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "trace.hpp" +#include namespace ox::trace { diff --git a/src/ox/std/tracehook.cpp b/src/ox/std/tracehook.cpp index ec0ea7433..77d5e7010 100644 --- a/src/ox/std/tracehook.cpp +++ b/src/ox/std/tracehook.cpp @@ -14,11 +14,11 @@ static const auto OxPrintTrace = std::getenv("OXTRACE") != nullptr; #endif -#include "strops.hpp" +#include -#include "math.hpp" -#include "stringview.hpp" -#include "types.hpp" +#include +#include +#include #define REG_MGBA_DEBUG_ENABLE *reinterpret_cast(0x4FFF780) #define REG_MGBA_DEBUG_FLAGS *reinterpret_cast(0x4FFF700) diff --git a/src/ox/std/typetraits.cpp b/src/ox/std/typetraits.cpp index 2db463992..d8c4788c8 100644 --- a/src/ox/std/typetraits.cpp +++ b/src/ox/std/typetraits.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "typetraits.hpp" +#include namespace ox { @@ -22,4 +22,4 @@ static_assert(is_move_constructible_v>); static_assert(!is_move_constructible_v>); static_assert(is_move_constructible_v>); -} \ No newline at end of file +} diff --git a/src/ox/std/uuid.cpp b/src/ox/std/uuid.cpp index 595a80cd1..18859f73c 100644 --- a/src/ox/std/uuid.cpp +++ b/src/ox/std/uuid.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "uuid.hpp" +#include namespace ox { diff --git a/src/ox/std/vec.cpp b/src/ox/std/vec.cpp index e4825858b..da7bd7e6a 100644 --- a/src/ox/std/vec.cpp +++ b/src/ox/std/vec.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "vec.hpp" +#include namespace ox {