diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf390447a..815f29976 100644 --- a/src/CMakeLists.txt +++ b/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/src/ox/clargs/CMakeLists.txt b/src/clargs/CMakeLists.txt similarity index 83% rename from src/ox/clargs/CMakeLists.txt rename to src/clargs/CMakeLists.txt index 06c399eb0..30c73578a 100644 --- a/src/ox/clargs/CMakeLists.txt +++ b/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/include/ox/clargs/clargs.hpp b/src/clargs/include/ox/clargs/clargs.hpp similarity index 100% rename from include/ox/clargs/clargs.hpp rename to src/clargs/include/ox/clargs/clargs.hpp diff --git a/src/ox/clargs/clargs.cpp b/src/clargs/src/clargs.cpp similarity index 100% rename from src/ox/clargs/clargs.cpp rename to src/clargs/src/clargs.cpp diff --git a/src/ox/claw/CMakeLists.txt b/src/claw/CMakeLists.txt similarity index 76% rename from src/ox/claw/CMakeLists.txt rename to src/claw/CMakeLists.txt index 7ddf44868..86eb642c7 100644 --- a/src/ox/claw/CMakeLists.txt +++ b/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,6 +27,18 @@ target_link_libraries( # ) #endif() +target_include_directories( + OxClaw PUBLIC + include +) + +install( + DIRECTORY + include/ox + DESTINATION + include +) + install( TARGETS OxClaw LIBRARY DESTINATION lib diff --git a/include/ox/claw/claw.hpp b/src/claw/include/ox/claw/claw.hpp similarity index 100% rename from include/ox/claw/claw.hpp rename to src/claw/include/ox/claw/claw.hpp diff --git a/include/ox/claw/format.hpp b/src/claw/include/ox/claw/format.hpp similarity index 100% rename from include/ox/claw/format.hpp rename to src/claw/include/ox/claw/format.hpp diff --git a/include/ox/claw/read.hpp b/src/claw/include/ox/claw/read.hpp similarity index 100% rename from include/ox/claw/read.hpp rename to src/claw/include/ox/claw/read.hpp diff --git a/include/ox/claw/write.hpp b/src/claw/include/ox/claw/write.hpp similarity index 100% rename from include/ox/claw/write.hpp rename to src/claw/include/ox/claw/write.hpp diff --git a/src/ox/claw/read.cpp b/src/claw/src/read.cpp similarity index 100% rename from src/ox/claw/read.cpp rename to src/claw/src/read.cpp diff --git a/src/ox/claw/readclaw.cpp b/src/claw/src/readclaw.cpp similarity index 100% rename from src/ox/claw/readclaw.cpp rename to src/claw/src/readclaw.cpp diff --git a/src/ox/claw/write.cpp b/src/claw/src/write.cpp similarity index 100% rename from src/ox/claw/write.cpp rename to src/claw/src/write.cpp diff --git a/src/ox/claw/test/CMakeLists.txt b/src/claw/test/CMakeLists.txt similarity index 100% rename from src/ox/claw/test/CMakeLists.txt rename to src/claw/test/CMakeLists.txt diff --git a/src/ox/claw/test/tests.cpp b/src/claw/test/tests.cpp similarity index 100% rename from src/ox/claw/test/tests.cpp rename to src/claw/test/tests.cpp diff --git a/src/event/CMakeLists.txt b/src/event/CMakeLists.txt new file mode 100644 index 000000000..7610c6c35 --- /dev/null +++ b/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/include/ox/event/event.hpp b/src/event/include/ox/event/event.hpp similarity index 100% rename from include/ox/event/event.hpp rename to src/event/include/ox/event/event.hpp diff --git a/include/ox/event/signal.hpp b/src/event/include/ox/event/signal.hpp similarity index 100% rename from include/ox/event/signal.hpp rename to src/event/include/ox/event/signal.hpp diff --git a/src/ox/event/signal.cpp b/src/event/src/signal.cpp similarity index 100% rename from src/ox/event/signal.cpp rename to src/event/src/signal.cpp diff --git a/src/ox/event/test/CMakeLists.txt b/src/event/test/CMakeLists.txt similarity index 100% rename from src/ox/event/test/CMakeLists.txt rename to src/event/test/CMakeLists.txt diff --git a/src/ox/event/test/tests.cpp b/src/event/test/tests.cpp similarity index 100% rename from src/ox/event/test/tests.cpp rename to src/event/test/tests.cpp diff --git a/src/ox/fs/CMakeLists.txt b/src/fs/CMakeLists.txt similarity index 67% rename from src/ox/fs/CMakeLists.txt rename to src/fs/CMakeLists.txt index 7adfa2397..77c346b0d 100644 --- a/src/ox/fs/CMakeLists.txt +++ b/src/fs/CMakeLists.txt @@ -5,12 +5,12 @@ endif() add_library( OxFS - 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) @@ -31,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( diff --git a/include/ox/fs/filestore/filestoretemplate.hpp b/src/fs/include/ox/fs/filestore/filestoretemplate.hpp similarity index 100% rename from include/ox/fs/filestore/filestoretemplate.hpp rename to src/fs/include/ox/fs/filestore/filestoretemplate.hpp diff --git a/include/ox/fs/filesystem/directory.hpp b/src/fs/include/ox/fs/filesystem/directory.hpp similarity index 100% rename from include/ox/fs/filesystem/directory.hpp rename to src/fs/include/ox/fs/filesystem/directory.hpp diff --git a/include/ox/fs/filesystem/filelocation.hpp b/src/fs/include/ox/fs/filesystem/filelocation.hpp similarity index 100% rename from include/ox/fs/filesystem/filelocation.hpp rename to src/fs/include/ox/fs/filesystem/filelocation.hpp diff --git a/include/ox/fs/filesystem/filesystem.hpp b/src/fs/include/ox/fs/filesystem/filesystem.hpp similarity index 100% rename from include/ox/fs/filesystem/filesystem.hpp rename to src/fs/include/ox/fs/filesystem/filesystem.hpp diff --git a/include/ox/fs/filesystem/passthroughfs.hpp b/src/fs/include/ox/fs/filesystem/passthroughfs.hpp similarity index 100% rename from include/ox/fs/filesystem/passthroughfs.hpp rename to src/fs/include/ox/fs/filesystem/passthroughfs.hpp diff --git a/include/ox/fs/filesystem/pathiterator.hpp b/src/fs/include/ox/fs/filesystem/pathiterator.hpp similarity index 100% rename from include/ox/fs/filesystem/pathiterator.hpp rename to src/fs/include/ox/fs/filesystem/pathiterator.hpp diff --git a/include/ox/fs/filesystem/types.hpp b/src/fs/include/ox/fs/filesystem/types.hpp similarity index 100% rename from include/ox/fs/filesystem/types.hpp rename to src/fs/include/ox/fs/filesystem/types.hpp diff --git a/include/ox/fs/fs.hpp b/src/fs/include/ox/fs/fs.hpp similarity index 100% rename from include/ox/fs/fs.hpp rename to src/fs/include/ox/fs/fs.hpp diff --git a/include/ox/fs/ptrarith/nodebuffer.hpp b/src/fs/include/ox/fs/ptrarith/nodebuffer.hpp similarity index 100% rename from include/ox/fs/ptrarith/nodebuffer.hpp rename to src/fs/include/ox/fs/ptrarith/nodebuffer.hpp diff --git a/include/ox/fs/ptrarith/ptr.hpp b/src/fs/include/ox/fs/ptrarith/ptr.hpp similarity index 100% rename from include/ox/fs/ptrarith/ptr.hpp rename to src/fs/include/ox/fs/ptrarith/ptr.hpp diff --git a/src/ox/fs/filestore/filestoretemplate.cpp b/src/fs/src/filestore/filestoretemplate.cpp similarity index 100% rename from src/ox/fs/filestore/filestoretemplate.cpp rename to src/fs/src/filestore/filestoretemplate.cpp diff --git a/src/ox/fs/filesystem/directory.cpp b/src/fs/src/filesystem/directory.cpp similarity index 100% rename from src/ox/fs/filesystem/directory.cpp rename to src/fs/src/filesystem/directory.cpp diff --git a/src/ox/fs/filesystem/filelocation.cpp b/src/fs/src/filesystem/filelocation.cpp similarity index 100% rename from src/ox/fs/filesystem/filelocation.cpp rename to src/fs/src/filesystem/filelocation.cpp diff --git a/src/ox/fs/filesystem/filesystem.cpp b/src/fs/src/filesystem/filesystem.cpp similarity index 100% rename from src/ox/fs/filesystem/filesystem.cpp rename to src/fs/src/filesystem/filesystem.cpp diff --git a/src/ox/fs/filesystem/passthroughfs.cpp b/src/fs/src/filesystem/passthroughfs.cpp similarity index 100% rename from src/ox/fs/filesystem/passthroughfs.cpp rename to src/fs/src/filesystem/passthroughfs.cpp diff --git a/src/ox/fs/filesystem/pathiterator.cpp b/src/fs/src/filesystem/pathiterator.cpp similarity index 100% rename from src/ox/fs/filesystem/pathiterator.cpp rename to src/fs/src/filesystem/pathiterator.cpp diff --git a/src/ox/fs/tool.cpp b/src/fs/src/tool.cpp similarity index 100% rename from src/ox/fs/tool.cpp rename to src/fs/src/tool.cpp diff --git a/src/ox/fs/test/CMakeLists.txt b/src/fs/test/CMakeLists.txt similarity index 100% rename from src/ox/fs/test/CMakeLists.txt rename to src/fs/test/CMakeLists.txt diff --git a/src/ox/fs/test/tests.cpp b/src/fs/test/tests.cpp similarity index 100% rename from src/ox/fs/test/tests.cpp rename to src/fs/test/tests.cpp diff --git a/src/ox/logconn/CMakeLists.txt b/src/logconn/CMakeLists.txt similarity index 81% rename from src/ox/logconn/CMakeLists.txt rename to src/logconn/CMakeLists.txt index ad218cdcf..7817a776c 100644 --- a/src/ox/logconn/CMakeLists.txt +++ b/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/include/ox/logconn/circularbuff.hpp b/src/logconn/include/ox/logconn/circularbuff.hpp similarity index 100% rename from include/ox/logconn/circularbuff.hpp rename to src/logconn/include/ox/logconn/circularbuff.hpp diff --git a/include/ox/logconn/def.hpp b/src/logconn/include/ox/logconn/def.hpp similarity index 100% rename from include/ox/logconn/def.hpp rename to src/logconn/include/ox/logconn/def.hpp diff --git a/include/ox/logconn/logconn.hpp b/src/logconn/include/ox/logconn/logconn.hpp similarity index 100% rename from include/ox/logconn/logconn.hpp rename to src/logconn/include/ox/logconn/logconn.hpp diff --git a/src/ox/logconn/logconn.cpp b/src/logconn/src/logconn.cpp similarity index 100% rename from src/ox/logconn/logconn.cpp rename to src/logconn/src/logconn.cpp diff --git a/src/ox/mc/CMakeLists.txt b/src/mc/CMakeLists.txt similarity index 65% rename from src/ox/mc/CMakeLists.txt rename to src/mc/CMakeLists.txt index 389fca45c..6c1860eef 100644 --- a/src/ox/mc/CMakeLists.txt +++ b/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/include/ox/mc/err.hpp b/src/mc/include/ox/mc/err.hpp similarity index 100% rename from include/ox/mc/err.hpp rename to src/mc/include/ox/mc/err.hpp diff --git a/include/ox/mc/intops.hpp b/src/mc/include/ox/mc/intops.hpp similarity index 100% rename from include/ox/mc/intops.hpp rename to src/mc/include/ox/mc/intops.hpp diff --git a/include/ox/mc/mc.hpp b/src/mc/include/ox/mc/mc.hpp similarity index 100% rename from include/ox/mc/mc.hpp rename to src/mc/include/ox/mc/mc.hpp diff --git a/include/ox/mc/presenceindicator.hpp b/src/mc/include/ox/mc/presenceindicator.hpp similarity index 100% rename from include/ox/mc/presenceindicator.hpp rename to src/mc/include/ox/mc/presenceindicator.hpp diff --git a/include/ox/mc/read.hpp b/src/mc/include/ox/mc/read.hpp similarity index 100% rename from include/ox/mc/read.hpp rename to src/mc/include/ox/mc/read.hpp diff --git a/include/ox/mc/types.hpp b/src/mc/include/ox/mc/types.hpp similarity index 100% rename from include/ox/mc/types.hpp rename to src/mc/include/ox/mc/types.hpp diff --git a/include/ox/mc/write.hpp b/src/mc/include/ox/mc/write.hpp similarity index 100% rename from include/ox/mc/write.hpp rename to src/mc/include/ox/mc/write.hpp diff --git a/src/ox/mc/read.cpp b/src/mc/src/read.cpp similarity index 100% rename from src/ox/mc/read.cpp rename to src/mc/src/read.cpp diff --git a/src/ox/mc/write.cpp b/src/mc/src/write.cpp similarity index 100% rename from src/ox/mc/write.cpp rename to src/mc/src/write.cpp diff --git a/src/ox/mc/test/CMakeLists.txt b/src/mc/test/CMakeLists.txt similarity index 100% rename from src/ox/mc/test/CMakeLists.txt rename to src/mc/test/CMakeLists.txt diff --git a/src/ox/mc/test/tests.cpp b/src/mc/test/tests.cpp similarity index 100% rename from src/ox/mc/test/tests.cpp rename to src/mc/test/tests.cpp diff --git a/src/model/CMakeLists.txt b/src/model/CMakeLists.txt new file mode 100644 index 000000000..a3fc725b5 --- /dev/null +++ b/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/include/ox/model/definition-language.txt b/src/model/definition-language.txt similarity index 100% rename from include/ox/model/definition-language.txt rename to src/model/definition-language.txt diff --git a/include/ox/model/def.hpp b/src/model/include/ox/model/def.hpp similarity index 100% rename from include/ox/model/def.hpp rename to src/model/include/ox/model/def.hpp diff --git a/src/ox/model/definition-language.txt b/src/model/include/ox/model/definition-language.txt similarity index 100% rename from src/ox/model/definition-language.txt rename to src/model/include/ox/model/definition-language.txt diff --git a/include/ox/model/descread.hpp b/src/model/include/ox/model/descread.hpp similarity index 100% rename from include/ox/model/descread.hpp rename to src/model/include/ox/model/descread.hpp diff --git a/include/ox/model/desctypes.hpp b/src/model/include/ox/model/desctypes.hpp similarity index 100% rename from include/ox/model/desctypes.hpp rename to src/model/include/ox/model/desctypes.hpp diff --git a/include/ox/model/descwrite.hpp b/src/model/include/ox/model/descwrite.hpp similarity index 100% rename from include/ox/model/descwrite.hpp rename to src/model/include/ox/model/descwrite.hpp diff --git a/include/ox/model/fieldcounter.hpp b/src/model/include/ox/model/fieldcounter.hpp similarity index 100% rename from include/ox/model/fieldcounter.hpp rename to src/model/include/ox/model/fieldcounter.hpp diff --git a/include/ox/model/metadata.hpp b/src/model/include/ox/model/metadata.hpp similarity index 100% rename from include/ox/model/metadata.hpp rename to src/model/include/ox/model/metadata.hpp diff --git a/include/ox/model/model.hpp b/src/model/include/ox/model/model.hpp similarity index 100% rename from include/ox/model/model.hpp rename to src/model/include/ox/model/model.hpp diff --git a/include/ox/model/modelhandleradaptor.hpp b/src/model/include/ox/model/modelhandleradaptor.hpp similarity index 100% rename from include/ox/model/modelhandleradaptor.hpp rename to src/model/include/ox/model/modelhandleradaptor.hpp diff --git a/include/ox/model/modelops.hpp b/src/model/include/ox/model/modelops.hpp similarity index 100% rename from include/ox/model/modelops.hpp rename to src/model/include/ox/model/modelops.hpp diff --git a/include/ox/model/modelvalue.hpp b/src/model/include/ox/model/modelvalue.hpp similarity index 100% rename from include/ox/model/modelvalue.hpp rename to src/model/include/ox/model/modelvalue.hpp diff --git a/include/ox/model/optype.hpp b/src/model/include/ox/model/optype.hpp similarity index 100% rename from include/ox/model/optype.hpp rename to src/model/include/ox/model/optype.hpp diff --git a/include/ox/model/typenamecatcher.hpp b/src/model/include/ox/model/typenamecatcher.hpp similarity index 100% rename from include/ox/model/typenamecatcher.hpp rename to src/model/include/ox/model/typenamecatcher.hpp diff --git a/include/ox/model/types.hpp b/src/model/include/ox/model/types.hpp similarity index 100% rename from include/ox/model/types.hpp rename to src/model/include/ox/model/types.hpp diff --git a/include/ox/model/typestore.hpp b/src/model/include/ox/model/typestore.hpp similarity index 100% rename from include/ox/model/typestore.hpp rename to src/model/include/ox/model/typestore.hpp diff --git a/include/ox/model/walk.hpp b/src/model/include/ox/model/walk.hpp similarity index 100% rename from include/ox/model/walk.hpp rename to src/model/include/ox/model/walk.hpp diff --git a/src/ox/model/desctypes.cpp b/src/model/src/desctypes.cpp similarity index 100% rename from src/ox/model/desctypes.cpp rename to src/model/src/desctypes.cpp diff --git a/src/ox/model/descwrite.cpp b/src/model/src/descwrite.cpp similarity index 100% rename from src/ox/model/descwrite.cpp rename to src/model/src/descwrite.cpp diff --git a/src/ox/model/modelvalue.cpp b/src/model/src/modelvalue.cpp similarity index 100% rename from src/ox/model/modelvalue.cpp rename to src/model/src/modelvalue.cpp diff --git a/src/ox/model/test/CMakeLists.txt b/src/model/test/CMakeLists.txt similarity index 100% rename from src/ox/model/test/CMakeLists.txt rename to src/model/test/CMakeLists.txt diff --git a/src/ox/model/test/tests.cpp b/src/model/test/tests.cpp similarity index 100% rename from src/ox/model/test/tests.cpp rename to src/model/test/tests.cpp diff --git a/src/ox/oc/CMakeLists.txt b/src/oc/CMakeLists.txt similarity index 70% rename from src/ox/oc/CMakeLists.txt rename to src/oc/CMakeLists.txt index 96d3d99b6..3f9352eef 100644 --- a/src/ox/oc/CMakeLists.txt +++ b/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/include/ox/oc/oc.hpp b/src/oc/include/ox/oc/oc.hpp similarity index 100% rename from include/ox/oc/oc.hpp rename to src/oc/include/ox/oc/oc.hpp diff --git a/include/ox/oc/read.hpp b/src/oc/include/ox/oc/read.hpp similarity index 100% rename from include/ox/oc/read.hpp rename to src/oc/include/ox/oc/read.hpp diff --git a/include/ox/oc/write.hpp b/src/oc/include/ox/oc/write.hpp similarity index 100% rename from include/ox/oc/write.hpp rename to src/oc/include/ox/oc/write.hpp diff --git a/src/ox/oc/read.cpp b/src/oc/src/read.cpp similarity index 100% rename from src/ox/oc/read.cpp rename to src/oc/src/read.cpp diff --git a/src/ox/oc/write.cpp b/src/oc/src/write.cpp similarity index 100% rename from src/ox/oc/write.cpp rename to src/oc/src/write.cpp diff --git a/src/ox/oc/test/CMakeLists.txt b/src/oc/test/CMakeLists.txt similarity index 100% rename from src/ox/oc/test/CMakeLists.txt rename to src/oc/test/CMakeLists.txt diff --git a/src/ox/oc/test/tests.cpp b/src/oc/test/tests.cpp similarity index 100% rename from src/ox/oc/test/tests.cpp rename to src/oc/test/tests.cpp diff --git a/src/ox/CMakeLists.txt b/src/ox/CMakeLists.txt deleted file mode 100644 index 815f29976..000000000 --- a/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/src/ox/event/CMakeLists.txt b/src/ox/event/CMakeLists.txt deleted file mode 100644 index 8f1933a21..000000000 --- a/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/src/ox/model/CMakeLists.txt b/src/ox/model/CMakeLists.txt deleted file mode 100644 index 19687d18b..000000000 --- a/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/src/ox/preloader/CMakeLists.txt b/src/preloader/CMakeLists.txt similarity index 73% rename from src/ox/preloader/CMakeLists.txt rename to src/preloader/CMakeLists.txt index 3c98acd1b..757b91fba 100644 --- a/src/ox/preloader/CMakeLists.txt +++ b/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/include/ox/preloader/alignmentcatcher.hpp b/src/preloader/include/ox/preloader/alignmentcatcher.hpp similarity index 100% rename from include/ox/preloader/alignmentcatcher.hpp rename to src/preloader/include/ox/preloader/alignmentcatcher.hpp diff --git a/include/ox/preloader/platspecs.hpp b/src/preloader/include/ox/preloader/platspecs.hpp similarity index 100% rename from include/ox/preloader/platspecs.hpp rename to src/preloader/include/ox/preloader/platspecs.hpp diff --git a/include/ox/preloader/preloader.hpp b/src/preloader/include/ox/preloader/preloader.hpp similarity index 100% rename from include/ox/preloader/preloader.hpp rename to src/preloader/include/ox/preloader/preloader.hpp diff --git a/include/ox/preloader/sizecatcher.hpp b/src/preloader/include/ox/preloader/sizecatcher.hpp similarity index 100% rename from include/ox/preloader/sizecatcher.hpp rename to src/preloader/include/ox/preloader/sizecatcher.hpp diff --git a/include/ox/preloader/unionsizecatcher.hpp b/src/preloader/include/ox/preloader/unionsizecatcher.hpp similarity index 100% rename from include/ox/preloader/unionsizecatcher.hpp rename to src/preloader/include/ox/preloader/unionsizecatcher.hpp diff --git a/src/ox/preloader/preloader.cpp b/src/preloader/src/preloader.cpp similarity index 100% rename from src/ox/preloader/preloader.cpp rename to src/preloader/src/preloader.cpp diff --git a/src/ox/std/CMakeLists.txt b/src/std/CMakeLists.txt similarity index 74% rename from src/ox/std/CMakeLists.txt rename to src/std/CMakeLists.txt index 2873bd43f..e8bd87065 100644 --- a/src/ox/std/CMakeLists.txt +++ b/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) @@ -93,12 +93,19 @@ target_link_libraries( target_include_directories( OxStd PUBLIC - ../../../include + include ) target_include_directories( OxTraceHook PUBLIC - ../../../include + include +) + +install( + DIRECTORY + include/ox + DESTINATION + include ) install( diff --git a/include/ox/std/algorithm.hpp b/src/std/include/ox/std/algorithm.hpp similarity index 100% rename from include/ox/std/algorithm.hpp rename to src/std/include/ox/std/algorithm.hpp diff --git a/include/ox/std/anyptr.hpp b/src/std/include/ox/std/anyptr.hpp similarity index 100% rename from include/ox/std/anyptr.hpp rename to src/std/include/ox/std/anyptr.hpp diff --git a/include/ox/std/array.hpp b/src/std/include/ox/std/array.hpp similarity index 100% rename from include/ox/std/array.hpp rename to src/std/include/ox/std/array.hpp diff --git a/include/ox/std/assert.hpp b/src/std/include/ox/std/assert.hpp similarity index 100% rename from include/ox/std/assert.hpp rename to src/std/include/ox/std/assert.hpp diff --git a/include/ox/std/basestringview.hpp b/src/std/include/ox/std/basestringview.hpp similarity index 100% rename from include/ox/std/basestringview.hpp rename to src/std/include/ox/std/basestringview.hpp diff --git a/include/ox/std/bit.hpp b/src/std/include/ox/std/bit.hpp similarity index 100% rename from include/ox/std/bit.hpp rename to src/std/include/ox/std/bit.hpp diff --git a/include/ox/std/bounds.hpp b/src/std/include/ox/std/bounds.hpp similarity index 100% rename from include/ox/std/bounds.hpp rename to src/std/include/ox/std/bounds.hpp diff --git a/include/ox/std/buffer.hpp b/src/std/include/ox/std/buffer.hpp similarity index 100% rename from include/ox/std/buffer.hpp rename to src/std/include/ox/std/buffer.hpp diff --git a/include/ox/std/buildinfo.hpp b/src/std/include/ox/std/buildinfo.hpp similarity index 100% rename from include/ox/std/buildinfo.hpp rename to src/std/include/ox/std/buildinfo.hpp diff --git a/include/ox/std/byteswap.hpp b/src/std/include/ox/std/byteswap.hpp similarity index 100% rename from include/ox/std/byteswap.hpp rename to src/std/include/ox/std/byteswap.hpp diff --git a/include/ox/std/concepts.hpp b/src/std/include/ox/std/concepts.hpp similarity index 100% rename from include/ox/std/concepts.hpp rename to src/std/include/ox/std/concepts.hpp diff --git a/include/ox/std/conv.hpp b/src/std/include/ox/std/conv.hpp similarity index 100% rename from include/ox/std/conv.hpp rename to src/std/include/ox/std/conv.hpp diff --git a/include/ox/std/cstringview.hpp b/src/std/include/ox/std/cstringview.hpp similarity index 100% rename from include/ox/std/cstringview.hpp rename to src/std/include/ox/std/cstringview.hpp diff --git a/include/ox/std/cstrops.hpp b/src/std/include/ox/std/cstrops.hpp similarity index 100% rename from include/ox/std/cstrops.hpp rename to src/std/include/ox/std/cstrops.hpp diff --git a/include/ox/std/def.hpp b/src/std/include/ox/std/def.hpp similarity index 100% rename from include/ox/std/def.hpp rename to src/std/include/ox/std/def.hpp diff --git a/include/ox/std/defer.hpp b/src/std/include/ox/std/defer.hpp similarity index 100% rename from include/ox/std/defer.hpp rename to src/std/include/ox/std/defer.hpp diff --git a/include/ox/std/defines.hpp b/src/std/include/ox/std/defines.hpp similarity index 100% rename from include/ox/std/defines.hpp rename to src/std/include/ox/std/defines.hpp diff --git a/include/ox/std/errhandling.hpp b/src/std/include/ox/std/errhandling.hpp similarity index 100% rename from include/ox/std/errhandling.hpp rename to src/std/include/ox/std/errhandling.hpp diff --git a/include/ox/std/error.hpp b/src/std/include/ox/std/error.hpp similarity index 100% rename from include/ox/std/error.hpp rename to src/std/include/ox/std/error.hpp diff --git a/include/ox/std/fmt.hpp b/src/std/include/ox/std/fmt.hpp similarity index 100% rename from include/ox/std/fmt.hpp rename to src/std/include/ox/std/fmt.hpp diff --git a/include/ox/std/hardware.hpp b/src/std/include/ox/std/hardware.hpp similarity index 100% rename from include/ox/std/hardware.hpp rename to src/std/include/ox/std/hardware.hpp diff --git a/include/ox/std/hash.hpp b/src/std/include/ox/std/hash.hpp similarity index 100% rename from include/ox/std/hash.hpp rename to src/std/include/ox/std/hash.hpp diff --git a/include/ox/std/hashmap.hpp b/src/std/include/ox/std/hashmap.hpp similarity index 100% rename from include/ox/std/hashmap.hpp rename to src/std/include/ox/std/hashmap.hpp diff --git a/include/ox/std/heapmgr.hpp b/src/std/include/ox/std/heapmgr.hpp similarity index 100% rename from include/ox/std/heapmgr.hpp rename to src/std/include/ox/std/heapmgr.hpp diff --git a/include/ox/std/ignore.hpp b/src/std/include/ox/std/ignore.hpp similarity index 100% rename from include/ox/std/ignore.hpp rename to src/std/include/ox/std/ignore.hpp diff --git a/include/ox/std/initializerlist.hpp b/src/std/include/ox/std/initializerlist.hpp similarity index 100% rename from include/ox/std/initializerlist.hpp rename to src/std/include/ox/std/initializerlist.hpp diff --git a/include/ox/std/istreamreader.hpp b/src/std/include/ox/std/istreamreader.hpp similarity index 100% rename from include/ox/std/istreamreader.hpp rename to src/std/include/ox/std/istreamreader.hpp diff --git a/include/ox/std/istring.hpp b/src/std/include/ox/std/istring.hpp similarity index 100% rename from include/ox/std/istring.hpp rename to src/std/include/ox/std/istring.hpp diff --git a/include/ox/std/iterator.hpp b/src/std/include/ox/std/iterator.hpp similarity index 100% rename from include/ox/std/iterator.hpp rename to src/std/include/ox/std/iterator.hpp diff --git a/include/ox/std/math.hpp b/src/std/include/ox/std/math.hpp similarity index 100% rename from include/ox/std/math.hpp rename to src/std/include/ox/std/math.hpp diff --git a/include/ox/std/maybeview.hpp b/src/std/include/ox/std/maybeview.hpp similarity index 100% rename from include/ox/std/maybeview.hpp rename to src/std/include/ox/std/maybeview.hpp diff --git a/include/ox/std/memops.hpp b/src/std/include/ox/std/memops.hpp similarity index 100% rename from include/ox/std/memops.hpp rename to src/std/include/ox/std/memops.hpp diff --git a/include/ox/std/memory.hpp b/src/std/include/ox/std/memory.hpp similarity index 100% rename from include/ox/std/memory.hpp rename to src/std/include/ox/std/memory.hpp diff --git a/include/ox/std/new.hpp b/src/std/include/ox/std/new.hpp similarity index 100% rename from include/ox/std/new.hpp rename to src/std/include/ox/std/new.hpp diff --git a/include/ox/std/optional.hpp b/src/std/include/ox/std/optional.hpp similarity index 100% rename from include/ox/std/optional.hpp rename to src/std/include/ox/std/optional.hpp diff --git a/include/ox/std/pair.hpp b/src/std/include/ox/std/pair.hpp similarity index 100% rename from include/ox/std/pair.hpp rename to src/std/include/ox/std/pair.hpp diff --git a/include/ox/std/point.hpp b/src/std/include/ox/std/point.hpp similarity index 99% rename from include/ox/std/point.hpp rename to src/std/include/ox/std/point.hpp index 0d99d054d..50fa57c4d 100644 --- a/include/ox/std/point.hpp +++ b/src/std/include/ox/std/point.hpp @@ -8,7 +8,6 @@ #pragma once -#include #include namespace ox { diff --git a/include/ox/std/random.hpp b/src/std/include/ox/std/random.hpp similarity index 100% rename from include/ox/std/random.hpp rename to src/std/include/ox/std/random.hpp diff --git a/include/ox/std/range.hpp b/src/std/include/ox/std/range.hpp similarity index 100% rename from include/ox/std/range.hpp rename to src/std/include/ox/std/range.hpp diff --git a/include/ox/std/ranges.hpp b/src/std/include/ox/std/ranges.hpp similarity index 100% rename from include/ox/std/ranges.hpp rename to src/std/include/ox/std/ranges.hpp diff --git a/include/ox/std/reader.hpp b/src/std/include/ox/std/reader.hpp similarity index 100% rename from include/ox/std/reader.hpp rename to src/std/include/ox/std/reader.hpp diff --git a/include/ox/std/realstd.hpp b/src/std/include/ox/std/realstd.hpp similarity index 100% rename from include/ox/std/realstd.hpp rename to src/std/include/ox/std/realstd.hpp diff --git a/include/ox/std/serialize.hpp b/src/std/include/ox/std/serialize.hpp similarity index 100% rename from include/ox/std/serialize.hpp rename to src/std/include/ox/std/serialize.hpp diff --git a/include/ox/std/size.hpp b/src/std/include/ox/std/size.hpp similarity index 100% rename from include/ox/std/size.hpp rename to src/std/include/ox/std/size.hpp diff --git a/include/ox/std/smallmap.hpp b/src/std/include/ox/std/smallmap.hpp similarity index 100% rename from include/ox/std/smallmap.hpp rename to src/std/include/ox/std/smallmap.hpp diff --git a/include/ox/std/source_location.hpp b/src/std/include/ox/std/source_location.hpp similarity index 100% rename from include/ox/std/source_location.hpp rename to src/std/include/ox/std/source_location.hpp diff --git a/include/ox/std/span.hpp b/src/std/include/ox/std/span.hpp similarity index 100% rename from include/ox/std/span.hpp rename to src/std/include/ox/std/span.hpp diff --git a/include/ox/std/stacktrace.hpp b/src/std/include/ox/std/stacktrace.hpp similarity index 100% rename from include/ox/std/stacktrace.hpp rename to src/std/include/ox/std/stacktrace.hpp diff --git a/include/ox/std/std.hpp b/src/std/include/ox/std/std.hpp similarity index 100% rename from include/ox/std/std.hpp rename to src/std/include/ox/std/std.hpp diff --git a/include/ox/std/stddef.hpp b/src/std/include/ox/std/stddef.hpp similarity index 100% rename from include/ox/std/stddef.hpp rename to src/std/include/ox/std/stddef.hpp diff --git a/include/ox/std/strconv.hpp b/src/std/include/ox/std/strconv.hpp similarity index 100% rename from include/ox/std/strconv.hpp rename to src/std/include/ox/std/strconv.hpp diff --git a/include/ox/std/string.hpp b/src/std/include/ox/std/string.hpp similarity index 100% rename from include/ox/std/string.hpp rename to src/std/include/ox/std/string.hpp diff --git a/include/ox/std/stringliteral.hpp b/src/std/include/ox/std/stringliteral.hpp similarity index 100% rename from include/ox/std/stringliteral.hpp rename to src/std/include/ox/std/stringliteral.hpp diff --git a/include/ox/std/stringparam.hpp b/src/std/include/ox/std/stringparam.hpp similarity index 100% rename from include/ox/std/stringparam.hpp rename to src/std/include/ox/std/stringparam.hpp diff --git a/include/ox/std/stringview.hpp b/src/std/include/ox/std/stringview.hpp similarity index 100% rename from include/ox/std/stringview.hpp rename to src/std/include/ox/std/stringview.hpp diff --git a/include/ox/std/strongint.hpp b/src/std/include/ox/std/strongint.hpp similarity index 100% rename from include/ox/std/strongint.hpp rename to src/std/include/ox/std/strongint.hpp diff --git a/include/ox/std/strops.hpp b/src/std/include/ox/std/strops.hpp similarity index 100% rename from include/ox/std/strops.hpp rename to src/std/include/ox/std/strops.hpp diff --git a/include/ox/std/trace.hpp b/src/std/include/ox/std/trace.hpp similarity index 100% rename from include/ox/std/trace.hpp rename to src/std/include/ox/std/trace.hpp diff --git a/include/ox/std/typeinfo.hpp b/src/std/include/ox/std/typeinfo.hpp similarity index 100% rename from include/ox/std/typeinfo.hpp rename to src/std/include/ox/std/typeinfo.hpp diff --git a/include/ox/std/types.hpp b/src/std/include/ox/std/types.hpp similarity index 100% rename from include/ox/std/types.hpp rename to src/std/include/ox/std/types.hpp diff --git a/include/ox/std/typetraits.hpp b/src/std/include/ox/std/typetraits.hpp similarity index 100% rename from include/ox/std/typetraits.hpp rename to src/std/include/ox/std/typetraits.hpp diff --git a/include/ox/std/units.hpp b/src/std/include/ox/std/units.hpp similarity index 100% rename from include/ox/std/units.hpp rename to src/std/include/ox/std/units.hpp diff --git a/include/ox/std/utility.hpp b/src/std/include/ox/std/utility.hpp similarity index 100% rename from include/ox/std/utility.hpp rename to src/std/include/ox/std/utility.hpp diff --git a/include/ox/std/uuid.hpp b/src/std/include/ox/std/uuid.hpp similarity index 100% rename from include/ox/std/uuid.hpp rename to src/std/include/ox/std/uuid.hpp diff --git a/include/ox/std/vec.hpp b/src/std/include/ox/std/vec.hpp similarity index 100% rename from include/ox/std/vec.hpp rename to src/std/include/ox/std/vec.hpp diff --git a/include/ox/std/vector.hpp b/src/std/include/ox/std/vector.hpp similarity index 100% rename from include/ox/std/vector.hpp rename to src/std/include/ox/std/vector.hpp diff --git a/include/ox/std/writer.hpp b/src/std/include/ox/std/writer.hpp similarity index 100% rename from include/ox/std/writer.hpp rename to src/std/include/ox/std/writer.hpp diff --git a/src/ox/std/assert.cpp b/src/std/src/assert.cpp similarity index 100% rename from src/ox/std/assert.cpp rename to src/std/src/assert.cpp diff --git a/src/ox/std/bit.cpp b/src/std/src/bit.cpp similarity index 100% rename from src/ox/std/bit.cpp rename to src/std/src/bit.cpp diff --git a/src/ox/std/buffer.cpp b/src/std/src/buffer.cpp similarity index 100% rename from src/ox/std/buffer.cpp rename to src/std/src/buffer.cpp diff --git a/src/ox/std/buildinfo.cpp b/src/std/src/buildinfo.cpp similarity index 100% rename from src/ox/std/buildinfo.cpp rename to src/std/src/buildinfo.cpp diff --git a/src/ox/std/byteswap.cpp b/src/std/src/byteswap.cpp similarity index 100% rename from src/ox/std/byteswap.cpp rename to src/std/src/byteswap.cpp diff --git a/src/ox/std/concepts.cpp b/src/std/src/concepts.cpp similarity index 100% rename from src/ox/std/concepts.cpp rename to src/std/src/concepts.cpp diff --git a/src/ox/std/fmt.cpp b/src/std/src/fmt.cpp similarity index 100% rename from src/ox/std/fmt.cpp rename to src/std/src/fmt.cpp diff --git a/src/ox/std/heapmgr.cpp b/src/std/src/heapmgr.cpp similarity index 100% rename from src/ox/std/heapmgr.cpp rename to src/std/src/heapmgr.cpp diff --git a/src/ox/std/istreamreader.cpp b/src/std/src/istreamreader.cpp similarity index 100% rename from src/ox/std/istreamreader.cpp rename to src/std/src/istreamreader.cpp diff --git a/src/ox/std/math.cpp b/src/std/src/math.cpp similarity index 100% rename from src/ox/std/math.cpp rename to src/std/src/math.cpp diff --git a/src/ox/std/memops.cpp b/src/std/src/memops.cpp similarity index 100% rename from src/ox/std/memops.cpp rename to src/std/src/memops.cpp diff --git a/src/ox/std/random.cpp b/src/std/src/random.cpp similarity index 100% rename from src/ox/std/random.cpp rename to src/std/src/random.cpp diff --git a/src/ox/std/reader.cpp b/src/std/src/reader.cpp similarity index 100% rename from src/ox/std/reader.cpp rename to src/std/src/reader.cpp diff --git a/src/ox/std/stacktrace.cpp b/src/std/src/stacktrace.cpp similarity index 100% rename from src/ox/std/stacktrace.cpp rename to src/std/src/stacktrace.cpp diff --git a/src/ox/std/string.cpp b/src/std/src/string.cpp similarity index 100% rename from src/ox/std/string.cpp rename to src/std/src/string.cpp diff --git a/src/ox/std/stringview.cpp b/src/std/src/stringview.cpp similarity index 100% rename from src/ox/std/stringview.cpp rename to src/std/src/stringview.cpp diff --git a/src/ox/std/strops.cpp b/src/std/src/strops.cpp similarity index 100% rename from src/ox/std/strops.cpp rename to src/std/src/strops.cpp diff --git a/src/ox/std/substitutes.cpp b/src/std/src/substitutes.cpp similarity index 100% rename from src/ox/std/substitutes.cpp rename to src/std/src/substitutes.cpp diff --git a/src/ox/std/trace.cpp b/src/std/src/trace.cpp similarity index 100% rename from src/ox/std/trace.cpp rename to src/std/src/trace.cpp diff --git a/src/ox/std/tracehook.cpp b/src/std/src/tracehook.cpp similarity index 100% rename from src/ox/std/tracehook.cpp rename to src/std/src/tracehook.cpp diff --git a/src/ox/std/typetraits.cpp b/src/std/src/typetraits.cpp similarity index 100% rename from src/ox/std/typetraits.cpp rename to src/std/src/typetraits.cpp diff --git a/src/ox/std/uuid.cpp b/src/std/src/uuid.cpp similarity index 100% rename from src/ox/std/uuid.cpp rename to src/std/src/uuid.cpp diff --git a/src/ox/std/vec.cpp b/src/std/src/vec.cpp similarity index 100% rename from src/ox/std/vec.cpp rename to src/std/src/vec.cpp diff --git a/src/ox/std/test/CMakeLists.txt b/src/std/test/CMakeLists.txt similarity index 100% rename from src/ox/std/test/CMakeLists.txt rename to src/std/test/CMakeLists.txt diff --git a/src/ox/std/test/tests.cpp b/src/std/test/tests.cpp similarity index 100% rename from src/ox/std/test/tests.cpp rename to src/std/test/tests.cpp