diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index a378f2a4c..15b2d582c 100644 --- a/deps/ox/CMakeLists.txt +++ b/deps/ox/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/deps/ox/src/CMakeLists.txt b/deps/ox/src/CMakeLists.txt index cf390447a..815f29976 100644 --- a/deps/ox/src/CMakeLists.txt +++ b/deps/ox/src/CMakeLists.txt @@ -1 +1,27 @@ -add_subdirectory(ox) +if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + set(OX_OS_WINDOWS TRUE) +endif() +if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set(OX_OS_FREEBSD TRUE) +else() + set(OX_OS_FREEBSD FALSE) +endif() + +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(OX_OS_LINUX TRUE) +else() + set(OX_OS_LINUX FALSE) +endif() + +if(OX_USE_STDLIB) + add_subdirectory(oc) +endif() +add_subdirectory(clargs) +add_subdirectory(claw) +add_subdirectory(event) +add_subdirectory(fs) +add_subdirectory(logconn) +add_subdirectory(mc) +add_subdirectory(model) +add_subdirectory(preloader) +add_subdirectory(std) diff --git a/deps/ox/src/ox/clargs/CMakeLists.txt b/deps/ox/src/clargs/CMakeLists.txt similarity index 83% rename from deps/ox/src/ox/clargs/CMakeLists.txt rename to deps/ox/src/clargs/CMakeLists.txt index 06c399eb0..30c73578a 100644 --- a/deps/ox/src/ox/clargs/CMakeLists.txt +++ b/deps/ox/src/clargs/CMakeLists.txt @@ -7,7 +7,7 @@ endif() add_library( OxClArgs - clargs.cpp + src/clargs.cpp ) set_property( @@ -27,11 +27,16 @@ target_link_libraries( OxStd ) +target_include_directories( + OxClArgs PUBLIC + include +) + install( - FILES - clargs.hpp + DIRECTORY + include/ox DESTINATION - include/ox/clargs + include ) install( diff --git a/deps/ox/src/ox/clargs/clargs.hpp b/deps/ox/src/clargs/include/ox/clargs/clargs.hpp similarity index 100% rename from deps/ox/src/ox/clargs/clargs.hpp rename to deps/ox/src/clargs/include/ox/clargs/clargs.hpp diff --git a/deps/ox/src/ox/clargs/clargs.cpp b/deps/ox/src/clargs/src/clargs.cpp similarity index 98% rename from deps/ox/src/ox/clargs/clargs.cpp rename to deps/ox/src/clargs/src/clargs.cpp index 1976f25f9..e779e4151 100644 --- a/deps/ox/src/ox/clargs/clargs.cpp +++ b/deps/ox/src/clargs/src/clargs.cpp @@ -7,7 +7,7 @@ */ #include -#include "clargs.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/claw/CMakeLists.txt b/deps/ox/src/claw/CMakeLists.txt similarity index 65% rename from deps/ox/src/ox/claw/CMakeLists.txt rename to deps/ox/src/claw/CMakeLists.txt index 4c13e5b07..86eb642c7 100644 --- a/deps/ox/src/ox/claw/CMakeLists.txt +++ b/deps/ox/src/claw/CMakeLists.txt @@ -1,8 +1,8 @@ add_library( OxClaw - read.cpp - write.cpp + src/read.cpp + src/write.cpp ) if(NOT MSVC) @@ -27,9 +27,22 @@ target_link_libraries( # ) #endif() -install(TARGETS OxClaw - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +target_include_directories( + OxClaw PUBLIC + include +) + +install( + DIRECTORY + include/ox + DESTINATION + include +) + +install( + TARGETS OxClaw + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/deps/ox/src/ox/claw/claw.hpp b/deps/ox/src/claw/include/ox/claw/claw.hpp similarity index 100% rename from deps/ox/src/ox/claw/claw.hpp rename to deps/ox/src/claw/include/ox/claw/claw.hpp diff --git a/deps/ox/src/ox/claw/format.hpp b/deps/ox/src/claw/include/ox/claw/format.hpp similarity index 100% rename from deps/ox/src/ox/claw/format.hpp rename to deps/ox/src/claw/include/ox/claw/format.hpp diff --git a/deps/ox/src/ox/claw/read.hpp b/deps/ox/src/claw/include/ox/claw/read.hpp similarity index 100% rename from deps/ox/src/ox/claw/read.hpp rename to deps/ox/src/claw/include/ox/claw/read.hpp diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/claw/include/ox/claw/write.hpp similarity index 100% rename from deps/ox/src/ox/claw/write.hpp rename to deps/ox/src/claw/include/ox/claw/write.hpp diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/claw/src/read.cpp similarity index 99% rename from deps/ox/src/ox/claw/read.cpp rename to deps/ox/src/claw/src/read.cpp index 8e12ebfc4..6f94e924b 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/claw/src/read.cpp @@ -8,7 +8,7 @@ #include -#include "read.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/claw/readclaw.cpp b/deps/ox/src/claw/src/readclaw.cpp similarity index 100% rename from deps/ox/src/ox/claw/readclaw.cpp rename to deps/ox/src/claw/src/readclaw.cpp diff --git a/deps/ox/src/ox/claw/write.cpp b/deps/ox/src/claw/src/write.cpp similarity index 94% rename from deps/ox/src/ox/claw/write.cpp rename to deps/ox/src/claw/src/write.cpp index c184be236..87858396b 100644 --- a/deps/ox/src/ox/claw/write.cpp +++ b/deps/ox/src/claw/src/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/deps/ox/src/ox/claw/test/CMakeLists.txt b/deps/ox/src/claw/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/claw/test/CMakeLists.txt rename to deps/ox/src/claw/test/CMakeLists.txt diff --git a/deps/ox/src/ox/claw/test/tests.cpp b/deps/ox/src/claw/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/claw/test/tests.cpp rename to deps/ox/src/claw/test/tests.cpp diff --git a/deps/ox/src/event/CMakeLists.txt b/deps/ox/src/event/CMakeLists.txt new file mode 100644 index 000000000..7610c6c35 --- /dev/null +++ b/deps/ox/src/event/CMakeLists.txt @@ -0,0 +1,51 @@ +add_library( + OxEvent + src/signal.cpp +) + +if(NOT MSVC) + target_compile_options(OxEvent PRIVATE -Wsign-conversion) + target_compile_options(OxEvent PRIVATE -Wconversion) +endif() + +if(NOT OX_BARE_METAL) + set_property( + TARGET + OxEvent + PROPERTY + POSITION_INDEPENDENT_CODE ON + ) +endif() + +target_compile_definitions( + OxEvent PUBLIC + $<$:OX_USE_STDLIB> + $<$:OX_NODEBUG> +) + +target_link_libraries( + OxEvent PUBLIC + OxStd +) + +target_include_directories( + OxEvent PUBLIC + include +) + +install( + DIRECTORY + include/ox + DESTINATION + include +) + +install( + TARGETS OxEvent + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(OX_RUN_TESTS) + add_subdirectory(test) +endif() diff --git a/deps/ox/src/ox/event/event.hpp b/deps/ox/src/event/include/ox/event/event.hpp similarity index 100% rename from deps/ox/src/ox/event/event.hpp rename to deps/ox/src/event/include/ox/event/event.hpp diff --git a/deps/ox/src/ox/event/signal.hpp b/deps/ox/src/event/include/ox/event/signal.hpp similarity index 100% rename from deps/ox/src/ox/event/signal.hpp rename to deps/ox/src/event/include/ox/event/signal.hpp diff --git a/deps/ox/src/ox/event/signal.cpp b/deps/ox/src/event/src/signal.cpp similarity index 95% rename from deps/ox/src/ox/event/signal.cpp rename to deps/ox/src/event/src/signal.cpp index a0928f6a3..69cb12cb8 100644 --- a/deps/ox/src/ox/event/signal.cpp +++ b/deps/ox/src/event/src/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/deps/ox/src/ox/event/test/CMakeLists.txt b/deps/ox/src/event/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/event/test/CMakeLists.txt rename to deps/ox/src/event/test/CMakeLists.txt diff --git a/deps/ox/src/ox/event/test/tests.cpp b/deps/ox/src/event/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/event/test/tests.cpp rename to deps/ox/src/event/test/tests.cpp diff --git a/deps/ox/src/ox/fs/CMakeLists.txt b/deps/ox/src/fs/CMakeLists.txt similarity index 58% rename from deps/ox/src/ox/fs/CMakeLists.txt rename to deps/ox/src/fs/CMakeLists.txt index 960f7c646..77c346b0d 100644 --- a/deps/ox/src/ox/fs/CMakeLists.txt +++ b/deps/ox/src/fs/CMakeLists.txt @@ -5,14 +5,12 @@ endif() add_library( OxFS - ptrarith/nodebuffer.hpp - ptrarith/ptr.hpp - filestore/filestoretemplate.cpp - filesystem/filelocation.cpp - filesystem/pathiterator.cpp - filesystem/directory.cpp - filesystem/filesystem.cpp - filesystem/passthroughfs.cpp + src/filestore/filestoretemplate.cpp + src/filesystem/filelocation.cpp + src/filesystem/pathiterator.cpp + src/filesystem/directory.cpp + src/filesystem/filesystem.cpp + src/filesystem/passthroughfs.cpp ) if(NOT MSVC) @@ -33,10 +31,22 @@ target_link_libraries( OxMetalClaw ) +target_include_directories( + OxFS PUBLIC + include +) + +install( + DIRECTORY + include/ox + DESTINATION + include +) + if(NOT OX_BARE_METAL) add_executable( oxfs-tool - tool.cpp + src/tool.cpp ) target_link_libraries( @@ -52,29 +62,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/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/fs/include/ox/fs/filestore/filestoretemplate.hpp similarity index 100% rename from deps/ox/src/ox/fs/filestore/filestoretemplate.hpp rename to deps/ox/src/fs/include/ox/fs/filestore/filestoretemplate.hpp diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/directory.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/directory.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/directory.hpp diff --git a/deps/ox/src/ox/fs/filesystem/filelocation.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/filelocation.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/filelocation.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/filelocation.hpp diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/filesystem.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/filesystem.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/filesystem.hpp diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/passthroughfs.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/passthroughfs.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/passthroughfs.hpp diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/pathiterator.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/pathiterator.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/pathiterator.hpp diff --git a/deps/ox/src/ox/fs/filesystem/types.hpp b/deps/ox/src/fs/include/ox/fs/filesystem/types.hpp similarity index 100% rename from deps/ox/src/ox/fs/filesystem/types.hpp rename to deps/ox/src/fs/include/ox/fs/filesystem/types.hpp diff --git a/deps/ox/src/ox/fs/fs.hpp b/deps/ox/src/fs/include/ox/fs/fs.hpp similarity index 100% rename from deps/ox/src/ox/fs/fs.hpp rename to deps/ox/src/fs/include/ox/fs/fs.hpp diff --git a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp b/deps/ox/src/fs/include/ox/fs/ptrarith/nodebuffer.hpp similarity index 100% rename from deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp rename to deps/ox/src/fs/include/ox/fs/ptrarith/nodebuffer.hpp diff --git a/deps/ox/src/ox/fs/ptrarith/ptr.hpp b/deps/ox/src/fs/include/ox/fs/ptrarith/ptr.hpp similarity index 100% rename from deps/ox/src/ox/fs/ptrarith/ptr.hpp rename to deps/ox/src/fs/include/ox/fs/ptrarith/ptr.hpp diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp b/deps/ox/src/fs/src/filestore/filestoretemplate.cpp similarity index 88% rename from deps/ox/src/ox/fs/filestore/filestoretemplate.cpp rename to deps/ox/src/fs/src/filestore/filestoretemplate.cpp index 3e3a638c0..89e586ab4 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp +++ b/deps/ox/src/fs/src/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/deps/ox/src/ox/fs/filesystem/directory.cpp b/deps/ox/src/fs/src/filesystem/directory.cpp similarity index 91% rename from deps/ox/src/ox/fs/filesystem/directory.cpp rename to deps/ox/src/fs/src/filesystem/directory.cpp index 648a3f1ae..9025d4062 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.cpp +++ b/deps/ox/src/fs/src/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/deps/ox/src/ox/fs/filesystem/filelocation.cpp b/deps/ox/src/fs/src/filesystem/filelocation.cpp similarity index 98% rename from deps/ox/src/ox/fs/filesystem/filelocation.cpp rename to deps/ox/src/fs/src/filesystem/filelocation.cpp index a7b9d71ea..6ef96d7be 100644 --- a/deps/ox/src/ox/fs/filesystem/filelocation.cpp +++ b/deps/ox/src/fs/src/filesystem/filelocation.cpp @@ -8,7 +8,7 @@ #include -#include "filelocation.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.cpp b/deps/ox/src/fs/src/filesystem/filesystem.cpp similarity index 98% rename from deps/ox/src/ox/fs/filesystem/filesystem.cpp rename to deps/ox/src/fs/src/filesystem/filesystem.cpp index 07e2c390b..da0e0844e 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp +++ b/deps/ox/src/fs/src/filesystem/filesystem.cpp @@ -9,7 +9,7 @@ #include #include -#include "filesystem.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/fs/src/filesystem/passthroughfs.cpp similarity index 99% rename from deps/ox/src/ox/fs/filesystem/passthroughfs.cpp rename to deps/ox/src/fs/src/filesystem/passthroughfs.cpp index f7cab7d9a..22489c5bc 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/fs/src/filesystem/passthroughfs.cpp @@ -8,7 +8,7 @@ #include -#include "passthroughfs.hpp" +#include #if defined(OX_HAS_PASSTHROUGHFS) diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp b/deps/ox/src/fs/src/filesystem/pathiterator.cpp similarity index 99% rename from deps/ox/src/ox/fs/filesystem/pathiterator.cpp rename to deps/ox/src/fs/src/filesystem/pathiterator.cpp index 39cf99aa4..d6205f86a 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp +++ b/deps/ox/src/fs/src/filesystem/pathiterator.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "pathiterator.hpp" +#include OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) diff --git a/deps/ox/src/ox/fs/tool.cpp b/deps/ox/src/fs/src/tool.cpp similarity index 100% rename from deps/ox/src/ox/fs/tool.cpp rename to deps/ox/src/fs/src/tool.cpp diff --git a/deps/ox/src/ox/fs/test/CMakeLists.txt b/deps/ox/src/fs/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/fs/test/CMakeLists.txt rename to deps/ox/src/fs/test/CMakeLists.txt diff --git a/deps/ox/src/ox/fs/test/tests.cpp b/deps/ox/src/fs/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/fs/test/tests.cpp rename to deps/ox/src/fs/test/tests.cpp diff --git a/deps/ox/src/ox/logconn/CMakeLists.txt b/deps/ox/src/logconn/CMakeLists.txt similarity index 81% rename from deps/ox/src/ox/logconn/CMakeLists.txt rename to deps/ox/src/logconn/CMakeLists.txt index ad218cdcf..7817a776c 100644 --- a/deps/ox/src/ox/logconn/CMakeLists.txt +++ b/deps/ox/src/logconn/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) add_library( OxLogConn - logconn.cpp + src/logconn.cpp ) set_property( @@ -24,12 +24,16 @@ target_link_libraries( $<$:ws2_32> ) +target_include_directories( + OxLogConn PUBLIC + include +) + install( - FILES - circularbuff.hpp - logconn.hpp + DIRECTORY + include/ox DESTINATION - include/ox/logconn + include ) install( diff --git a/deps/ox/src/ox/logconn/circularbuff.hpp b/deps/ox/src/logconn/include/ox/logconn/circularbuff.hpp similarity index 100% rename from deps/ox/src/ox/logconn/circularbuff.hpp rename to deps/ox/src/logconn/include/ox/logconn/circularbuff.hpp diff --git a/deps/ox/src/ox/logconn/def.hpp b/deps/ox/src/logconn/include/ox/logconn/def.hpp similarity index 100% rename from deps/ox/src/ox/logconn/def.hpp rename to deps/ox/src/logconn/include/ox/logconn/def.hpp diff --git a/deps/ox/src/ox/logconn/logconn.hpp b/deps/ox/src/logconn/include/ox/logconn/logconn.hpp similarity index 100% rename from deps/ox/src/ox/logconn/logconn.hpp rename to deps/ox/src/logconn/include/ox/logconn/logconn.hpp diff --git a/deps/ox/src/ox/logconn/logconn.cpp b/deps/ox/src/logconn/src/logconn.cpp similarity index 98% rename from deps/ox/src/ox/logconn/logconn.cpp rename to deps/ox/src/logconn/src/logconn.cpp index d101e6180..8d1ff71cf 100644 --- a/deps/ox/src/ox/logconn/logconn.cpp +++ b/deps/ox/src/logconn/src/logconn.cpp @@ -23,7 +23,7 @@ #endif -#include "logconn.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/mc/CMakeLists.txt b/deps/ox/src/mc/CMakeLists.txt similarity index 65% rename from deps/ox/src/ox/mc/CMakeLists.txt rename to deps/ox/src/mc/CMakeLists.txt index 389fca45c..6c1860eef 100644 --- a/deps/ox/src/ox/mc/CMakeLists.txt +++ b/deps/ox/src/mc/CMakeLists.txt @@ -1,7 +1,7 @@ add_library( OxMetalClaw - read.cpp - write.cpp + src/read.cpp + src/write.cpp ) if(NOT MSVC) @@ -24,22 +24,22 @@ if(NOT OX_BARE_METAL) ) endif() -install( - FILES - intops.hpp - err.hpp - mc.hpp - presenceindicator.hpp - read.hpp - types.hpp - write.hpp - DESTINATION - include/ox/mc +target_include_directories( + OxMetalClaw PUBLIC + include ) -install(TARGETS OxMetalClaw - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +install( + DIRECTORY + include/ox + DESTINATION + include +) + +install( + TARGETS OxMetalClaw + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/deps/ox/src/ox/mc/err.hpp b/deps/ox/src/mc/include/ox/mc/err.hpp similarity index 100% rename from deps/ox/src/ox/mc/err.hpp rename to deps/ox/src/mc/include/ox/mc/err.hpp diff --git a/deps/ox/src/ox/mc/intops.hpp b/deps/ox/src/mc/include/ox/mc/intops.hpp similarity index 100% rename from deps/ox/src/ox/mc/intops.hpp rename to deps/ox/src/mc/include/ox/mc/intops.hpp diff --git a/deps/ox/src/ox/mc/mc.hpp b/deps/ox/src/mc/include/ox/mc/mc.hpp similarity index 100% rename from deps/ox/src/ox/mc/mc.hpp rename to deps/ox/src/mc/include/ox/mc/mc.hpp diff --git a/deps/ox/src/ox/mc/presenceindicator.hpp b/deps/ox/src/mc/include/ox/mc/presenceindicator.hpp similarity index 100% rename from deps/ox/src/ox/mc/presenceindicator.hpp rename to deps/ox/src/mc/include/ox/mc/presenceindicator.hpp diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/mc/include/ox/mc/read.hpp similarity index 100% rename from deps/ox/src/ox/mc/read.hpp rename to deps/ox/src/mc/include/ox/mc/read.hpp diff --git a/deps/ox/src/ox/mc/types.hpp b/deps/ox/src/mc/include/ox/mc/types.hpp similarity index 100% rename from deps/ox/src/ox/mc/types.hpp rename to deps/ox/src/mc/include/ox/mc/types.hpp diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/mc/include/ox/mc/write.hpp similarity index 100% rename from deps/ox/src/ox/mc/write.hpp rename to deps/ox/src/mc/include/ox/mc/write.hpp diff --git a/deps/ox/src/ox/mc/read.cpp b/deps/ox/src/mc/src/read.cpp similarity index 94% rename from deps/ox/src/ox/mc/read.cpp rename to deps/ox/src/mc/src/read.cpp index de3e6038c..8a77c0e34 100644 --- a/deps/ox/src/ox/mc/read.cpp +++ b/deps/ox/src/mc/src/read.cpp @@ -10,7 +10,7 @@ #include #include -#include "read.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/mc/write.cpp b/deps/ox/src/mc/src/write.cpp similarity index 95% rename from deps/ox/src/ox/mc/write.cpp rename to deps/ox/src/mc/src/write.cpp index 80dea56f8..cc5fd9d7d 100644 --- a/deps/ox/src/ox/mc/write.cpp +++ b/deps/ox/src/mc/src/write.cpp @@ -11,7 +11,7 @@ #include #include -#include "write.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/mc/test/CMakeLists.txt b/deps/ox/src/mc/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/mc/test/CMakeLists.txt rename to deps/ox/src/mc/test/CMakeLists.txt diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/mc/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/mc/test/tests.cpp rename to deps/ox/src/mc/test/tests.cpp diff --git a/deps/ox/src/model/CMakeLists.txt b/deps/ox/src/model/CMakeLists.txt new file mode 100644 index 000000000..a3fc725b5 --- /dev/null +++ b/deps/ox/src/model/CMakeLists.txt @@ -0,0 +1,45 @@ +add_library( + OxModel + src/desctypes.cpp + src/descwrite.cpp + src/modelvalue.cpp +) + +if(NOT MSVC) + target_compile_options(OxModel PRIVATE -Wconversion) + target_compile_options(OxModel PRIVATE -Wsign-conversion) +endif() + +target_link_libraries( + OxModel PUBLIC + OxStd +) + +if(NOT OX_BARE_METAL) + set_property( + TARGET + OxModel + PROPERTY + POSITION_INDEPENDENT_CODE ON + ) +endif() + +target_link_libraries( + OxModel PUBLIC + OxStd +) + +target_include_directories( + OxModel PUBLIC + include +) + +install( + TARGETS OxModel + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(OX_RUN_TESTS) + add_subdirectory(test) +endif() diff --git a/deps/ox/src/ox/model/definition-language.txt b/deps/ox/src/model/definition-language.txt similarity index 100% rename from deps/ox/src/ox/model/definition-language.txt rename to deps/ox/src/model/definition-language.txt diff --git a/deps/ox/src/ox/model/def.hpp b/deps/ox/src/model/include/ox/model/def.hpp similarity index 100% rename from deps/ox/src/ox/model/def.hpp rename to deps/ox/src/model/include/ox/model/def.hpp diff --git a/deps/ox/src/model/include/ox/model/definition-language.txt b/deps/ox/src/model/include/ox/model/definition-language.txt new file mode 100644 index 000000000..70a40807a --- /dev/null +++ b/deps/ox/src/model/include/ox/model/definition-language.txt @@ -0,0 +1,7 @@ + : + : | + : + : | + : + : <0: single> | <1: list> + : diff --git a/deps/ox/src/ox/model/descread.hpp b/deps/ox/src/model/include/ox/model/descread.hpp similarity index 100% rename from deps/ox/src/ox/model/descread.hpp rename to deps/ox/src/model/include/ox/model/descread.hpp diff --git a/deps/ox/src/ox/model/desctypes.hpp b/deps/ox/src/model/include/ox/model/desctypes.hpp similarity index 100% rename from deps/ox/src/ox/model/desctypes.hpp rename to deps/ox/src/model/include/ox/model/desctypes.hpp diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/model/include/ox/model/descwrite.hpp similarity index 100% rename from deps/ox/src/ox/model/descwrite.hpp rename to deps/ox/src/model/include/ox/model/descwrite.hpp diff --git a/deps/ox/src/ox/model/fieldcounter.hpp b/deps/ox/src/model/include/ox/model/fieldcounter.hpp similarity index 100% rename from deps/ox/src/ox/model/fieldcounter.hpp rename to deps/ox/src/model/include/ox/model/fieldcounter.hpp diff --git a/deps/ox/src/ox/model/metadata.hpp b/deps/ox/src/model/include/ox/model/metadata.hpp similarity index 100% rename from deps/ox/src/ox/model/metadata.hpp rename to deps/ox/src/model/include/ox/model/metadata.hpp diff --git a/deps/ox/src/ox/model/model.hpp b/deps/ox/src/model/include/ox/model/model.hpp similarity index 100% rename from deps/ox/src/ox/model/model.hpp rename to deps/ox/src/model/include/ox/model/model.hpp diff --git a/deps/ox/src/ox/model/modelhandleradaptor.hpp b/deps/ox/src/model/include/ox/model/modelhandleradaptor.hpp similarity index 100% rename from deps/ox/src/ox/model/modelhandleradaptor.hpp rename to deps/ox/src/model/include/ox/model/modelhandleradaptor.hpp diff --git a/deps/ox/src/ox/model/modelops.hpp b/deps/ox/src/model/include/ox/model/modelops.hpp similarity index 100% rename from deps/ox/src/ox/model/modelops.hpp rename to deps/ox/src/model/include/ox/model/modelops.hpp diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/model/include/ox/model/modelvalue.hpp similarity index 100% rename from deps/ox/src/ox/model/modelvalue.hpp rename to deps/ox/src/model/include/ox/model/modelvalue.hpp diff --git a/deps/ox/src/ox/model/optype.hpp b/deps/ox/src/model/include/ox/model/optype.hpp similarity index 100% rename from deps/ox/src/ox/model/optype.hpp rename to deps/ox/src/model/include/ox/model/optype.hpp diff --git a/deps/ox/src/ox/model/typenamecatcher.hpp b/deps/ox/src/model/include/ox/model/typenamecatcher.hpp similarity index 100% rename from deps/ox/src/ox/model/typenamecatcher.hpp rename to deps/ox/src/model/include/ox/model/typenamecatcher.hpp diff --git a/deps/ox/src/ox/model/types.hpp b/deps/ox/src/model/include/ox/model/types.hpp similarity index 100% rename from deps/ox/src/ox/model/types.hpp rename to deps/ox/src/model/include/ox/model/types.hpp diff --git a/deps/ox/src/ox/model/typestore.hpp b/deps/ox/src/model/include/ox/model/typestore.hpp similarity index 100% rename from deps/ox/src/ox/model/typestore.hpp rename to deps/ox/src/model/include/ox/model/typestore.hpp diff --git a/deps/ox/src/ox/model/walk.hpp b/deps/ox/src/model/include/ox/model/walk.hpp similarity index 100% rename from deps/ox/src/ox/model/walk.hpp rename to deps/ox/src/model/include/ox/model/walk.hpp diff --git a/deps/ox/src/ox/model/desctypes.cpp b/deps/ox/src/model/src/desctypes.cpp similarity index 89% rename from deps/ox/src/ox/model/desctypes.cpp rename to deps/ox/src/model/src/desctypes.cpp index f04b9061e..5f9132557 100644 --- a/deps/ox/src/ox/model/desctypes.cpp +++ b/deps/ox/src/model/src/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/deps/ox/src/ox/model/descwrite.cpp b/deps/ox/src/model/src/descwrite.cpp similarity index 97% rename from deps/ox/src/ox/model/descwrite.cpp rename to deps/ox/src/model/src/descwrite.cpp index 9421d513f..fcba2b508 100644 --- a/deps/ox/src/ox/model/descwrite.cpp +++ b/deps/ox/src/model/src/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/deps/ox/src/ox/model/modelvalue.cpp b/deps/ox/src/model/src/modelvalue.cpp similarity index 95% rename from deps/ox/src/ox/model/modelvalue.cpp rename to deps/ox/src/model/src/modelvalue.cpp index ea3136cc5..759c3566d 100644 --- a/deps/ox/src/ox/model/modelvalue.cpp +++ b/deps/ox/src/model/src/modelvalue.cpp @@ -8,7 +8,7 @@ #include -#include "modelvalue.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/model/test/CMakeLists.txt b/deps/ox/src/model/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/model/test/CMakeLists.txt rename to deps/ox/src/model/test/CMakeLists.txt diff --git a/deps/ox/src/ox/model/test/tests.cpp b/deps/ox/src/model/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/model/test/tests.cpp rename to deps/ox/src/model/test/tests.cpp diff --git a/deps/ox/src/ox/oc/CMakeLists.txt b/deps/ox/src/oc/CMakeLists.txt similarity index 70% rename from deps/ox/src/ox/oc/CMakeLists.txt rename to deps/ox/src/oc/CMakeLists.txt index 96d3d99b6..3f9352eef 100644 --- a/deps/ox/src/ox/oc/CMakeLists.txt +++ b/deps/ox/src/oc/CMakeLists.txt @@ -1,7 +1,7 @@ add_library( OxOrganicClaw - read.cpp - write.cpp + src/read.cpp + src/write.cpp ) if(NOT MSVC) @@ -27,18 +27,22 @@ set_property( POSITION_INDEPENDENT_CODE ON ) -install( - FILES - oc.hpp - read.hpp - write.hpp - DESTINATION - include/ox/oc +target_include_directories( + OxOrganicClaw PUBLIC + include ) -install(TARGETS OxOrganicClaw - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +install( + DIRECTORY + include/ox + DESTINATION + include +) + +install( + TARGETS OxOrganicClaw + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/deps/ox/src/ox/oc/oc.hpp b/deps/ox/src/oc/include/ox/oc/oc.hpp similarity index 100% rename from deps/ox/src/ox/oc/oc.hpp rename to deps/ox/src/oc/include/ox/oc/oc.hpp diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/oc/include/ox/oc/read.hpp similarity index 100% rename from deps/ox/src/ox/oc/read.hpp rename to deps/ox/src/oc/include/ox/oc/read.hpp diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/oc/include/ox/oc/write.hpp similarity index 100% rename from deps/ox/src/ox/oc/write.hpp rename to deps/ox/src/oc/include/ox/oc/write.hpp diff --git a/deps/ox/src/ox/oc/read.cpp b/deps/ox/src/oc/src/read.cpp similarity index 99% rename from deps/ox/src/ox/oc/read.cpp rename to deps/ox/src/oc/src/read.cpp index d20749f93..e6d6c7d4f 100644 --- a/deps/ox/src/ox/oc/read.cpp +++ b/deps/ox/src/oc/src/read.cpp @@ -9,7 +9,7 @@ #include #include -#include "read.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/oc/write.cpp b/deps/ox/src/oc/src/write.cpp similarity index 97% rename from deps/ox/src/ox/oc/write.cpp rename to deps/ox/src/oc/src/write.cpp index 618b930f8..189d747a6 100644 --- a/deps/ox/src/ox/oc/write.cpp +++ b/deps/ox/src/oc/src/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/deps/ox/src/ox/oc/test/CMakeLists.txt b/deps/ox/src/oc/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/oc/test/CMakeLists.txt rename to deps/ox/src/oc/test/CMakeLists.txt diff --git a/deps/ox/src/ox/oc/test/tests.cpp b/deps/ox/src/oc/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/oc/test/tests.cpp rename to deps/ox/src/oc/test/tests.cpp diff --git a/deps/ox/src/ox/CMakeLists.txt b/deps/ox/src/ox/CMakeLists.txt deleted file mode 100644 index 815f29976..000000000 --- a/deps/ox/src/ox/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - set(OX_OS_WINDOWS TRUE) -endif() -if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - set(OX_OS_FREEBSD TRUE) -else() - set(OX_OS_FREEBSD FALSE) -endif() - -if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(OX_OS_LINUX TRUE) -else() - set(OX_OS_LINUX FALSE) -endif() - -if(OX_USE_STDLIB) - add_subdirectory(oc) -endif() -add_subdirectory(clargs) -add_subdirectory(claw) -add_subdirectory(event) -add_subdirectory(fs) -add_subdirectory(logconn) -add_subdirectory(mc) -add_subdirectory(model) -add_subdirectory(preloader) -add_subdirectory(std) diff --git a/deps/ox/src/ox/event/CMakeLists.txt b/deps/ox/src/ox/event/CMakeLists.txt deleted file mode 100644 index 8f1933a21..000000000 --- a/deps/ox/src/ox/event/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -add_library( - OxEvent - signal.cpp -) - -if(NOT MSVC) - target_compile_options(OxEvent PRIVATE -Wsign-conversion) - target_compile_options(OxEvent PRIVATE -Wconversion) -endif() - -if(NOT OX_BARE_METAL) - set_property( - TARGET - OxEvent - PROPERTY - POSITION_INDEPENDENT_CODE ON - ) -endif() - -target_compile_definitions( - OxEvent PUBLIC - $<$:OX_USE_STDLIB> - $<$:OX_NODEBUG> -) - -target_link_libraries( - OxEvent PUBLIC - OxStd -) - -install( - FILES - event.hpp - signal.hpp - DESTINATION - include/ox/event -) - -install(TARGETS OxEvent - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(OX_RUN_TESTS) - add_subdirectory(test) -endif() diff --git a/deps/ox/src/ox/model/CMakeLists.txt b/deps/ox/src/ox/model/CMakeLists.txt deleted file mode 100644 index 19687d18b..000000000 --- a/deps/ox/src/ox/model/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -add_library( - OxModel - desctypes.cpp - descwrite.cpp - modelvalue.cpp -) - -if(NOT MSVC) - target_compile_options(OxModel PRIVATE -Wconversion) - target_compile_options(OxModel PRIVATE -Wsign-conversion) -endif() - -target_link_libraries( - OxModel PUBLIC - OxStd -) - -if(NOT OX_BARE_METAL) - set_property( - TARGET - OxModel - PROPERTY - POSITION_INDEPENDENT_CODE ON - ) -endif() - -install( - FILES - def.hpp - descread.hpp - desctypes.hpp - descwrite.hpp - optype.hpp - metadata.hpp - model.hpp - modelhandleradaptor.hpp - modelops.hpp - modelvalue.hpp - typenamecatcher.hpp - types.hpp - typestore.hpp - walk.hpp - DESTINATION - include/ox/model -) - -install(TARGETS OxModel - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(OX_RUN_TESTS) - add_subdirectory(test) -endif() diff --git a/deps/ox/src/ox/preloader/CMakeLists.txt b/deps/ox/src/preloader/CMakeLists.txt similarity index 73% rename from deps/ox/src/ox/preloader/CMakeLists.txt rename to deps/ox/src/preloader/CMakeLists.txt index 3c98acd1b..757b91fba 100644 --- a/deps/ox/src/ox/preloader/CMakeLists.txt +++ b/deps/ox/src/preloader/CMakeLists.txt @@ -1,7 +1,7 @@ add_library( OxPreloader - preloader.cpp + src/preloader.cpp ) if(NOT MSVC) @@ -16,14 +16,16 @@ target_link_libraries( OxStd ) +target_include_directories( + OxPreloader PUBLIC + include +) + install( - FILES - alignmentcatcher.hpp - platspecs.hpp - preloader.hpp - unionsizecatcher.hpp + DIRECTORY + include/ox DESTINATION - include/nostalgia/preloader + include ) install( diff --git a/deps/ox/src/ox/preloader/alignmentcatcher.hpp b/deps/ox/src/preloader/include/ox/preloader/alignmentcatcher.hpp similarity index 100% rename from deps/ox/src/ox/preloader/alignmentcatcher.hpp rename to deps/ox/src/preloader/include/ox/preloader/alignmentcatcher.hpp diff --git a/deps/ox/src/ox/preloader/platspecs.hpp b/deps/ox/src/preloader/include/ox/preloader/platspecs.hpp similarity index 100% rename from deps/ox/src/ox/preloader/platspecs.hpp rename to deps/ox/src/preloader/include/ox/preloader/platspecs.hpp diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/preloader/include/ox/preloader/preloader.hpp similarity index 100% rename from deps/ox/src/ox/preloader/preloader.hpp rename to deps/ox/src/preloader/include/ox/preloader/preloader.hpp diff --git a/deps/ox/src/ox/preloader/sizecatcher.hpp b/deps/ox/src/preloader/include/ox/preloader/sizecatcher.hpp similarity index 100% rename from deps/ox/src/ox/preloader/sizecatcher.hpp rename to deps/ox/src/preloader/include/ox/preloader/sizecatcher.hpp diff --git a/deps/ox/src/ox/preloader/unionsizecatcher.hpp b/deps/ox/src/preloader/include/ox/preloader/unionsizecatcher.hpp similarity index 100% rename from deps/ox/src/ox/preloader/unionsizecatcher.hpp rename to deps/ox/src/preloader/include/ox/preloader/unionsizecatcher.hpp diff --git a/deps/ox/src/ox/preloader/preloader.cpp b/deps/ox/src/preloader/src/preloader.cpp similarity index 89% rename from deps/ox/src/ox/preloader/preloader.cpp rename to deps/ox/src/preloader/src/preloader.cpp index 732df2927..b428bb5de 100644 --- a/deps/ox/src/ox/preloader/preloader.cpp +++ b/deps/ox/src/preloader/src/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/deps/ox/src/ox/std/CMakeLists.txt b/deps/ox/src/std/CMakeLists.txt similarity index 53% rename from deps/ox/src/ox/std/CMakeLists.txt rename to deps/ox/src/std/CMakeLists.txt index 0c8f27d00..e8bd87065 100644 --- a/deps/ox/src/ox/std/CMakeLists.txt +++ b/deps/ox/src/std/CMakeLists.txt @@ -7,12 +7,12 @@ endif() if(OX_USE_STDLIB AND OX_ENABLE_TRACEHOOK) add_library( OxTraceHook SHARED - tracehook.cpp + src/tracehook.cpp ) else() add_library( OxTraceHook - tracehook.cpp + src/tracehook.cpp ) endif() @@ -25,28 +25,28 @@ target_compile_definitions( add_library( OxStd - assert.cpp - bit.cpp - buffer.cpp - buildinfo.cpp - byteswap.cpp - concepts.cpp - fmt.cpp - heapmgr.cpp - istreamreader.cpp - math.cpp - memops.cpp - random.cpp - reader.cpp - substitutes.cpp - stacktrace.cpp - string.cpp - stringview.cpp - strops.cpp - trace.cpp - typetraits.cpp - uuid.cpp - vec.cpp + src/assert.cpp + src/bit.cpp + src/buffer.cpp + src/buildinfo.cpp + src/byteswap.cpp + src/concepts.cpp + src/fmt.cpp + src/heapmgr.cpp + src/istreamreader.cpp + src/math.cpp + src/memops.cpp + src/random.cpp + src/reader.cpp + src/substitutes.cpp + src/stacktrace.cpp + src/string.cpp + src/stringview.cpp + src/strops.cpp + src/trace.cpp + src/typetraits.cpp + src/uuid.cpp + src/vec.cpp ) if(NOT MSVC) @@ -91,70 +91,27 @@ 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( + DIRECTORY + include/ox + DESTINATION + include +) + +install( + TARGETS OxStd OxTraceHook + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) if(OX_RUN_TESTS) diff --git a/deps/ox/src/ox/std/algorithm.hpp b/deps/ox/src/std/include/ox/std/algorithm.hpp similarity index 100% rename from deps/ox/src/ox/std/algorithm.hpp rename to deps/ox/src/std/include/ox/std/algorithm.hpp diff --git a/deps/ox/src/ox/std/anyptr.hpp b/deps/ox/src/std/include/ox/std/anyptr.hpp similarity index 100% rename from deps/ox/src/ox/std/anyptr.hpp rename to deps/ox/src/std/include/ox/std/anyptr.hpp diff --git a/deps/ox/src/ox/std/array.hpp b/deps/ox/src/std/include/ox/std/array.hpp similarity index 100% rename from deps/ox/src/ox/std/array.hpp rename to deps/ox/src/std/include/ox/std/array.hpp diff --git a/deps/ox/src/ox/std/assert.hpp b/deps/ox/src/std/include/ox/std/assert.hpp similarity index 100% rename from deps/ox/src/ox/std/assert.hpp rename to deps/ox/src/std/include/ox/std/assert.hpp diff --git a/deps/ox/src/ox/std/basestringview.hpp b/deps/ox/src/std/include/ox/std/basestringview.hpp similarity index 100% rename from deps/ox/src/ox/std/basestringview.hpp rename to deps/ox/src/std/include/ox/std/basestringview.hpp diff --git a/deps/ox/src/ox/std/bit.hpp b/deps/ox/src/std/include/ox/std/bit.hpp similarity index 100% rename from deps/ox/src/ox/std/bit.hpp rename to deps/ox/src/std/include/ox/std/bit.hpp diff --git a/deps/ox/src/ox/std/bounds.hpp b/deps/ox/src/std/include/ox/std/bounds.hpp similarity index 100% rename from deps/ox/src/ox/std/bounds.hpp rename to deps/ox/src/std/include/ox/std/bounds.hpp diff --git a/deps/ox/src/ox/std/buffer.hpp b/deps/ox/src/std/include/ox/std/buffer.hpp similarity index 100% rename from deps/ox/src/ox/std/buffer.hpp rename to deps/ox/src/std/include/ox/std/buffer.hpp diff --git a/deps/ox/src/ox/std/buildinfo.hpp b/deps/ox/src/std/include/ox/std/buildinfo.hpp similarity index 100% rename from deps/ox/src/ox/std/buildinfo.hpp rename to deps/ox/src/std/include/ox/std/buildinfo.hpp diff --git a/deps/ox/src/ox/std/byteswap.hpp b/deps/ox/src/std/include/ox/std/byteswap.hpp similarity index 100% rename from deps/ox/src/ox/std/byteswap.hpp rename to deps/ox/src/std/include/ox/std/byteswap.hpp diff --git a/deps/ox/src/ox/std/concepts.hpp b/deps/ox/src/std/include/ox/std/concepts.hpp similarity index 100% rename from deps/ox/src/ox/std/concepts.hpp rename to deps/ox/src/std/include/ox/std/concepts.hpp diff --git a/deps/ox/src/ox/std/conv.hpp b/deps/ox/src/std/include/ox/std/conv.hpp similarity index 100% rename from deps/ox/src/ox/std/conv.hpp rename to deps/ox/src/std/include/ox/std/conv.hpp diff --git a/deps/ox/src/ox/std/cstringview.hpp b/deps/ox/src/std/include/ox/std/cstringview.hpp similarity index 100% rename from deps/ox/src/ox/std/cstringview.hpp rename to deps/ox/src/std/include/ox/std/cstringview.hpp diff --git a/deps/ox/src/ox/std/cstrops.hpp b/deps/ox/src/std/include/ox/std/cstrops.hpp similarity index 100% rename from deps/ox/src/ox/std/cstrops.hpp rename to deps/ox/src/std/include/ox/std/cstrops.hpp diff --git a/deps/ox/src/ox/std/def.hpp b/deps/ox/src/std/include/ox/std/def.hpp similarity index 100% rename from deps/ox/src/ox/std/def.hpp rename to deps/ox/src/std/include/ox/std/def.hpp diff --git a/deps/ox/src/ox/std/defer.hpp b/deps/ox/src/std/include/ox/std/defer.hpp similarity index 100% rename from deps/ox/src/ox/std/defer.hpp rename to deps/ox/src/std/include/ox/std/defer.hpp diff --git a/deps/ox/src/ox/std/defines.hpp b/deps/ox/src/std/include/ox/std/defines.hpp similarity index 100% rename from deps/ox/src/ox/std/defines.hpp rename to deps/ox/src/std/include/ox/std/defines.hpp diff --git a/deps/ox/src/ox/std/errhandling.hpp b/deps/ox/src/std/include/ox/std/errhandling.hpp similarity index 100% rename from deps/ox/src/ox/std/errhandling.hpp rename to deps/ox/src/std/include/ox/std/errhandling.hpp diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/std/include/ox/std/error.hpp similarity index 100% rename from deps/ox/src/ox/std/error.hpp rename to deps/ox/src/std/include/ox/std/error.hpp diff --git a/deps/ox/src/ox/std/fmt.hpp b/deps/ox/src/std/include/ox/std/fmt.hpp similarity index 100% rename from deps/ox/src/ox/std/fmt.hpp rename to deps/ox/src/std/include/ox/std/fmt.hpp diff --git a/deps/ox/src/ox/std/hardware.hpp b/deps/ox/src/std/include/ox/std/hardware.hpp similarity index 100% rename from deps/ox/src/ox/std/hardware.hpp rename to deps/ox/src/std/include/ox/std/hardware.hpp diff --git a/deps/ox/src/ox/std/hash.hpp b/deps/ox/src/std/include/ox/std/hash.hpp similarity index 100% rename from deps/ox/src/ox/std/hash.hpp rename to deps/ox/src/std/include/ox/std/hash.hpp diff --git a/deps/ox/src/ox/std/hashmap.hpp b/deps/ox/src/std/include/ox/std/hashmap.hpp similarity index 100% rename from deps/ox/src/ox/std/hashmap.hpp rename to deps/ox/src/std/include/ox/std/hashmap.hpp diff --git a/deps/ox/src/ox/std/heapmgr.hpp b/deps/ox/src/std/include/ox/std/heapmgr.hpp similarity index 100% rename from deps/ox/src/ox/std/heapmgr.hpp rename to deps/ox/src/std/include/ox/std/heapmgr.hpp diff --git a/deps/ox/src/ox/std/ignore.hpp b/deps/ox/src/std/include/ox/std/ignore.hpp similarity index 100% rename from deps/ox/src/ox/std/ignore.hpp rename to deps/ox/src/std/include/ox/std/ignore.hpp diff --git a/deps/ox/src/ox/std/initializerlist.hpp b/deps/ox/src/std/include/ox/std/initializerlist.hpp similarity index 100% rename from deps/ox/src/ox/std/initializerlist.hpp rename to deps/ox/src/std/include/ox/std/initializerlist.hpp diff --git a/deps/ox/src/ox/std/istreamreader.hpp b/deps/ox/src/std/include/ox/std/istreamreader.hpp similarity index 100% rename from deps/ox/src/ox/std/istreamreader.hpp rename to deps/ox/src/std/include/ox/std/istreamreader.hpp diff --git a/deps/ox/src/ox/std/istring.hpp b/deps/ox/src/std/include/ox/std/istring.hpp similarity index 100% rename from deps/ox/src/ox/std/istring.hpp rename to deps/ox/src/std/include/ox/std/istring.hpp diff --git a/deps/ox/src/ox/std/iterator.hpp b/deps/ox/src/std/include/ox/std/iterator.hpp similarity index 100% rename from deps/ox/src/ox/std/iterator.hpp rename to deps/ox/src/std/include/ox/std/iterator.hpp diff --git a/deps/ox/src/ox/std/math.hpp b/deps/ox/src/std/include/ox/std/math.hpp similarity index 100% rename from deps/ox/src/ox/std/math.hpp rename to deps/ox/src/std/include/ox/std/math.hpp diff --git a/deps/ox/src/ox/std/maybeview.hpp b/deps/ox/src/std/include/ox/std/maybeview.hpp similarity index 100% rename from deps/ox/src/ox/std/maybeview.hpp rename to deps/ox/src/std/include/ox/std/maybeview.hpp diff --git a/deps/ox/src/ox/std/memops.hpp b/deps/ox/src/std/include/ox/std/memops.hpp similarity index 100% rename from deps/ox/src/ox/std/memops.hpp rename to deps/ox/src/std/include/ox/std/memops.hpp diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/std/include/ox/std/memory.hpp similarity index 100% rename from deps/ox/src/ox/std/memory.hpp rename to deps/ox/src/std/include/ox/std/memory.hpp diff --git a/deps/ox/src/ox/std/new.hpp b/deps/ox/src/std/include/ox/std/new.hpp similarity index 100% rename from deps/ox/src/ox/std/new.hpp rename to deps/ox/src/std/include/ox/std/new.hpp diff --git a/deps/ox/src/ox/std/optional.hpp b/deps/ox/src/std/include/ox/std/optional.hpp similarity index 100% rename from deps/ox/src/ox/std/optional.hpp rename to deps/ox/src/std/include/ox/std/optional.hpp diff --git a/deps/ox/src/ox/std/pair.hpp b/deps/ox/src/std/include/ox/std/pair.hpp similarity index 100% rename from deps/ox/src/ox/std/pair.hpp rename to deps/ox/src/std/include/ox/std/pair.hpp diff --git a/deps/ox/src/ox/std/point.hpp b/deps/ox/src/std/include/ox/std/point.hpp similarity index 99% rename from deps/ox/src/ox/std/point.hpp rename to deps/ox/src/std/include/ox/std/point.hpp index 0d99d054d..50fa57c4d 100644 --- a/deps/ox/src/ox/std/point.hpp +++ b/deps/ox/src/std/include/ox/std/point.hpp @@ -8,7 +8,6 @@ #pragma once -#include #include namespace ox { diff --git a/deps/ox/src/ox/std/random.hpp b/deps/ox/src/std/include/ox/std/random.hpp similarity index 100% rename from deps/ox/src/ox/std/random.hpp rename to deps/ox/src/std/include/ox/std/random.hpp diff --git a/deps/ox/src/ox/std/range.hpp b/deps/ox/src/std/include/ox/std/range.hpp similarity index 100% rename from deps/ox/src/ox/std/range.hpp rename to deps/ox/src/std/include/ox/std/range.hpp diff --git a/deps/ox/src/ox/std/ranges.hpp b/deps/ox/src/std/include/ox/std/ranges.hpp similarity index 100% rename from deps/ox/src/ox/std/ranges.hpp rename to deps/ox/src/std/include/ox/std/ranges.hpp diff --git a/deps/ox/src/ox/std/reader.hpp b/deps/ox/src/std/include/ox/std/reader.hpp similarity index 100% rename from deps/ox/src/ox/std/reader.hpp rename to deps/ox/src/std/include/ox/std/reader.hpp diff --git a/deps/ox/src/ox/std/realstd.hpp b/deps/ox/src/std/include/ox/std/realstd.hpp similarity index 100% rename from deps/ox/src/ox/std/realstd.hpp rename to deps/ox/src/std/include/ox/std/realstd.hpp diff --git a/deps/ox/src/ox/std/serialize.hpp b/deps/ox/src/std/include/ox/std/serialize.hpp similarity index 100% rename from deps/ox/src/ox/std/serialize.hpp rename to deps/ox/src/std/include/ox/std/serialize.hpp diff --git a/deps/ox/src/ox/std/size.hpp b/deps/ox/src/std/include/ox/std/size.hpp similarity index 100% rename from deps/ox/src/ox/std/size.hpp rename to deps/ox/src/std/include/ox/std/size.hpp diff --git a/deps/ox/src/ox/std/smallmap.hpp b/deps/ox/src/std/include/ox/std/smallmap.hpp similarity index 100% rename from deps/ox/src/ox/std/smallmap.hpp rename to deps/ox/src/std/include/ox/std/smallmap.hpp diff --git a/deps/ox/src/ox/std/source_location.hpp b/deps/ox/src/std/include/ox/std/source_location.hpp similarity index 100% rename from deps/ox/src/ox/std/source_location.hpp rename to deps/ox/src/std/include/ox/std/source_location.hpp diff --git a/deps/ox/src/ox/std/span.hpp b/deps/ox/src/std/include/ox/std/span.hpp similarity index 100% rename from deps/ox/src/ox/std/span.hpp rename to deps/ox/src/std/include/ox/std/span.hpp diff --git a/deps/ox/src/ox/std/stacktrace.hpp b/deps/ox/src/std/include/ox/std/stacktrace.hpp similarity index 100% rename from deps/ox/src/ox/std/stacktrace.hpp rename to deps/ox/src/std/include/ox/std/stacktrace.hpp diff --git a/deps/ox/src/ox/std/std.hpp b/deps/ox/src/std/include/ox/std/std.hpp similarity index 100% rename from deps/ox/src/ox/std/std.hpp rename to deps/ox/src/std/include/ox/std/std.hpp diff --git a/deps/ox/src/ox/std/stddef.hpp b/deps/ox/src/std/include/ox/std/stddef.hpp similarity index 100% rename from deps/ox/src/ox/std/stddef.hpp rename to deps/ox/src/std/include/ox/std/stddef.hpp diff --git a/deps/ox/src/ox/std/strconv.hpp b/deps/ox/src/std/include/ox/std/strconv.hpp similarity index 100% rename from deps/ox/src/ox/std/strconv.hpp rename to deps/ox/src/std/include/ox/std/strconv.hpp diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/std/include/ox/std/string.hpp similarity index 100% rename from deps/ox/src/ox/std/string.hpp rename to deps/ox/src/std/include/ox/std/string.hpp diff --git a/deps/ox/src/ox/std/stringliteral.hpp b/deps/ox/src/std/include/ox/std/stringliteral.hpp similarity index 100% rename from deps/ox/src/ox/std/stringliteral.hpp rename to deps/ox/src/std/include/ox/std/stringliteral.hpp diff --git a/deps/ox/src/ox/std/stringparam.hpp b/deps/ox/src/std/include/ox/std/stringparam.hpp similarity index 100% rename from deps/ox/src/ox/std/stringparam.hpp rename to deps/ox/src/std/include/ox/std/stringparam.hpp diff --git a/deps/ox/src/ox/std/stringview.hpp b/deps/ox/src/std/include/ox/std/stringview.hpp similarity index 100% rename from deps/ox/src/ox/std/stringview.hpp rename to deps/ox/src/std/include/ox/std/stringview.hpp diff --git a/deps/ox/src/ox/std/strongint.hpp b/deps/ox/src/std/include/ox/std/strongint.hpp similarity index 100% rename from deps/ox/src/ox/std/strongint.hpp rename to deps/ox/src/std/include/ox/std/strongint.hpp diff --git a/deps/ox/src/ox/std/strops.hpp b/deps/ox/src/std/include/ox/std/strops.hpp similarity index 100% rename from deps/ox/src/ox/std/strops.hpp rename to deps/ox/src/std/include/ox/std/strops.hpp diff --git a/deps/ox/src/ox/std/trace.hpp b/deps/ox/src/std/include/ox/std/trace.hpp similarity index 100% rename from deps/ox/src/ox/std/trace.hpp rename to deps/ox/src/std/include/ox/std/trace.hpp diff --git a/deps/ox/src/ox/std/typeinfo.hpp b/deps/ox/src/std/include/ox/std/typeinfo.hpp similarity index 100% rename from deps/ox/src/ox/std/typeinfo.hpp rename to deps/ox/src/std/include/ox/std/typeinfo.hpp diff --git a/deps/ox/src/ox/std/types.hpp b/deps/ox/src/std/include/ox/std/types.hpp similarity index 100% rename from deps/ox/src/ox/std/types.hpp rename to deps/ox/src/std/include/ox/std/types.hpp diff --git a/deps/ox/src/ox/std/typetraits.hpp b/deps/ox/src/std/include/ox/std/typetraits.hpp similarity index 100% rename from deps/ox/src/ox/std/typetraits.hpp rename to deps/ox/src/std/include/ox/std/typetraits.hpp diff --git a/deps/ox/src/ox/std/units.hpp b/deps/ox/src/std/include/ox/std/units.hpp similarity index 100% rename from deps/ox/src/ox/std/units.hpp rename to deps/ox/src/std/include/ox/std/units.hpp diff --git a/deps/ox/src/ox/std/utility.hpp b/deps/ox/src/std/include/ox/std/utility.hpp similarity index 100% rename from deps/ox/src/ox/std/utility.hpp rename to deps/ox/src/std/include/ox/std/utility.hpp diff --git a/deps/ox/src/ox/std/uuid.hpp b/deps/ox/src/std/include/ox/std/uuid.hpp similarity index 100% rename from deps/ox/src/ox/std/uuid.hpp rename to deps/ox/src/std/include/ox/std/uuid.hpp diff --git a/deps/ox/src/ox/std/vec.hpp b/deps/ox/src/std/include/ox/std/vec.hpp similarity index 100% rename from deps/ox/src/ox/std/vec.hpp rename to deps/ox/src/std/include/ox/std/vec.hpp diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/std/include/ox/std/vector.hpp similarity index 100% rename from deps/ox/src/ox/std/vector.hpp rename to deps/ox/src/std/include/ox/std/vector.hpp diff --git a/deps/ox/src/ox/std/writer.hpp b/deps/ox/src/std/include/ox/std/writer.hpp similarity index 100% rename from deps/ox/src/ox/std/writer.hpp rename to deps/ox/src/std/include/ox/std/writer.hpp diff --git a/deps/ox/src/ox/std/assert.cpp b/deps/ox/src/std/src/assert.cpp similarity index 94% rename from deps/ox/src/ox/std/assert.cpp rename to deps/ox/src/std/src/assert.cpp index d63a796da..0d5ee7ff0 100644 --- a/deps/ox/src/ox/std/assert.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/bit.cpp b/deps/ox/src/std/src/bit.cpp similarity index 97% rename from deps/ox/src/ox/std/bit.cpp rename to deps/ox/src/std/src/bit.cpp index 24600afed..1d15a679b 100644 --- a/deps/ox/src/ox/std/bit.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/buffer.cpp b/deps/ox/src/std/src/buffer.cpp similarity index 88% rename from deps/ox/src/ox/std/buffer.cpp rename to deps/ox/src/std/src/buffer.cpp index b15548c3a..9794ced80 100644 --- a/deps/ox/src/ox/std/buffer.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/buildinfo.cpp b/deps/ox/src/std/src/buildinfo.cpp similarity index 100% rename from deps/ox/src/ox/std/buildinfo.cpp rename to deps/ox/src/std/src/buildinfo.cpp diff --git a/deps/ox/src/ox/std/byteswap.cpp b/deps/ox/src/std/src/byteswap.cpp similarity index 99% rename from deps/ox/src/ox/std/byteswap.cpp rename to deps/ox/src/std/src/byteswap.cpp index 85963cb49..f4141e31c 100644 --- a/deps/ox/src/ox/std/byteswap.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/concepts.cpp b/deps/ox/src/std/src/concepts.cpp similarity index 95% rename from deps/ox/src/ox/std/concepts.cpp rename to deps/ox/src/std/src/concepts.cpp index e6314cf80..8ed94986b 100644 --- a/deps/ox/src/ox/std/concepts.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/fmt.cpp b/deps/ox/src/std/src/fmt.cpp similarity index 98% rename from deps/ox/src/ox/std/fmt.cpp rename to deps/ox/src/std/src/fmt.cpp index 7abf8c8aa..0d7b8c4ba 100644 --- a/deps/ox/src/ox/std/fmt.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/heapmgr.cpp b/deps/ox/src/std/src/heapmgr.cpp similarity index 96% rename from deps/ox/src/ox/std/heapmgr.cpp rename to deps/ox/src/std/src/heapmgr.cpp index 90e9f19c1..a84a9cb3e 100644 --- a/deps/ox/src/ox/std/heapmgr.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/istreamreader.cpp b/deps/ox/src/std/src/istreamreader.cpp similarity index 94% rename from deps/ox/src/ox/std/istreamreader.cpp rename to deps/ox/src/std/src/istreamreader.cpp index 3eaa94180..b1988ac92 100644 --- a/deps/ox/src/ox/std/istreamreader.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/math.cpp b/deps/ox/src/std/src/math.cpp similarity index 95% rename from deps/ox/src/ox/std/math.cpp rename to deps/ox/src/std/src/math.cpp index 962bbed3c..2816eb5a5 100644 --- a/deps/ox/src/ox/std/math.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/memops.cpp b/deps/ox/src/std/src/memops.cpp similarity index 96% rename from deps/ox/src/ox/std/memops.cpp rename to deps/ox/src/std/src/memops.cpp index 06b9ad5c2..22e33dc23 100644 --- a/deps/ox/src/ox/std/memops.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/random.cpp b/deps/ox/src/std/src/random.cpp similarity index 83% rename from deps/ox/src/ox/std/random.cpp rename to deps/ox/src/std/src/random.cpp index 53c27d34e..0b4204f97 100644 --- a/deps/ox/src/ox/std/random.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/reader.cpp b/deps/ox/src/std/src/reader.cpp similarity index 100% rename from deps/ox/src/ox/std/reader.cpp rename to deps/ox/src/std/src/reader.cpp diff --git a/deps/ox/src/ox/std/stacktrace.cpp b/deps/ox/src/std/src/stacktrace.cpp similarity index 95% rename from deps/ox/src/ox/std/stacktrace.cpp rename to deps/ox/src/std/src/stacktrace.cpp index ae4d3d1c9..436b2153b 100644 --- a/deps/ox/src/ox/std/stacktrace.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/string.cpp b/deps/ox/src/std/src/string.cpp similarity index 95% rename from deps/ox/src/ox/std/string.cpp rename to deps/ox/src/std/src/string.cpp index ff43e3caf..856393280 100644 --- a/deps/ox/src/ox/std/string.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/stringview.cpp b/deps/ox/src/std/src/stringview.cpp similarity index 96% rename from deps/ox/src/ox/std/stringview.cpp rename to deps/ox/src/std/src/stringview.cpp index b71f116f3..8eb523224 100644 --- a/deps/ox/src/ox/std/stringview.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/strops.cpp b/deps/ox/src/std/src/strops.cpp similarity index 94% rename from deps/ox/src/ox/std/strops.cpp rename to deps/ox/src/std/src/strops.cpp index b08988e10..41e87fdc2 100644 --- a/deps/ox/src/ox/std/strops.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/substitutes.cpp b/deps/ox/src/std/src/substitutes.cpp similarity index 100% rename from deps/ox/src/ox/std/substitutes.cpp rename to deps/ox/src/std/src/substitutes.cpp diff --git a/deps/ox/src/ox/std/trace.cpp b/deps/ox/src/std/src/trace.cpp similarity index 96% rename from deps/ox/src/ox/std/trace.cpp rename to deps/ox/src/std/src/trace.cpp index bb43e4bc2..d360c7d24 100644 --- a/deps/ox/src/ox/std/trace.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/tracehook.cpp b/deps/ox/src/std/src/tracehook.cpp similarity index 96% rename from deps/ox/src/ox/std/tracehook.cpp rename to deps/ox/src/std/src/tracehook.cpp index ec0ea7433..77d5e7010 100644 --- a/deps/ox/src/ox/std/tracehook.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/typetraits.cpp b/deps/ox/src/std/src/typetraits.cpp similarity index 96% rename from deps/ox/src/ox/std/typetraits.cpp rename to deps/ox/src/std/src/typetraits.cpp index 2db463992..d8c4788c8 100644 --- a/deps/ox/src/ox/std/typetraits.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/uuid.cpp b/deps/ox/src/std/src/uuid.cpp similarity index 97% rename from deps/ox/src/ox/std/uuid.cpp rename to deps/ox/src/std/src/uuid.cpp index 595a80cd1..18859f73c 100644 --- a/deps/ox/src/ox/std/uuid.cpp +++ b/deps/ox/src/std/src/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/deps/ox/src/ox/std/vec.cpp b/deps/ox/src/std/src/vec.cpp similarity index 93% rename from deps/ox/src/ox/std/vec.cpp rename to deps/ox/src/std/src/vec.cpp index e4825858b..da7bd7e6a 100644 --- a/deps/ox/src/ox/std/vec.cpp +++ b/deps/ox/src/std/src/vec.cpp @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "vec.hpp" +#include namespace ox { diff --git a/deps/ox/src/ox/std/test/CMakeLists.txt b/deps/ox/src/std/test/CMakeLists.txt similarity index 100% rename from deps/ox/src/ox/std/test/CMakeLists.txt rename to deps/ox/src/std/test/CMakeLists.txt diff --git a/deps/ox/src/ox/std/test/tests.cpp b/deps/ox/src/std/test/tests.cpp similarity index 100% rename from deps/ox/src/ox/std/test/tests.cpp rename to deps/ox/src/std/test/tests.cpp