chore(build): improve include paths

storm/Array.hpp

@@ -1,8 +1,8 @@
 #ifndef STORM_ARRAY_HPP
 #define STORM_ARRAY_HPP
 
-#include "array/TSBaseArray.hpp"
-#include "array/TSFixedArray.hpp"
-#include "array/TSGrowableArray.hpp"
+#include "storm/array/TSBaseArray.hpp"
+#include "storm/array/TSFixedArray.hpp"
+#include "storm/array/TSGrowableArray.hpp"
 
 #endif

storm/CMakeLists.txt

@@ -19,5 +19,5 @@ add_library(storm STATIC
 
 target_include_directories(storm
     PRIVATE
-        ${CMAKE_SOURCE_DIR}/storm
+        ${PROJECT_SOURCE_DIR}
 )

storm/List.hpp

@@ -1,9 +1,9 @@
 #ifndef STORM_LIST_HPP
 #define STORM_LIST_HPP
 
-#include "list/TSExplicitList.hpp"
-#include "list/TSLink.hpp"
-#include "list/TSLinkedNode.hpp"
-#include "list/TSList.hpp"
+#include "storm/list/TSExplicitList.hpp"
+#include "storm/list/TSLink.hpp"
+#include "storm/list/TSLinkedNode.hpp"
+#include "storm/list/TSList.hpp"
 
 #endif

storm/Memory.cpp

@@ -1,4 +1,4 @@
-#include "Memory.hpp"
+#include "storm/Memory.hpp"
 
 constexpr size_t ALIGNMENT = 8;
 

storm/String.cpp

@@ -1,5 +1,5 @@
-#include "String.hpp"
-#include "Error.hpp"
+#include "storm/String.hpp"
+#include "storm/Error.hpp"
 
 size_t SStrCopy(char* dest, const char* source, size_t destsize) {
     STORM_ASSERT(dest);

storm/Thread.hpp

@@ -1,10 +1,10 @@
 #ifndef STORM_THREAD_HPP
 #define STORM_THREAD_HPP
 
-#include "thread/SCritSect.hpp"
-#include "thread/SEvent.hpp"
-#include "thread/SSyncObject.hpp"
-#include "thread/SThread.hpp"
+#include "storm/thread/SCritSect.hpp"
+#include "storm/thread/SEvent.hpp"
+#include "storm/thread/SSyncObject.hpp"
+#include "storm/thread/SThread.hpp"
 #include <cstdint>
 
 int32_t SCreateThread(uint32_t (*threadProc)(void*), void* threadParam, void* a3, SThread* syncObject, const char* threadName);

storm/array/TSFixedArray.hpp

@@ -1,8 +1,8 @@
 #ifndef STORM_ARRAY_TS_FIXED_ARRAY_HPP
 #define STORM_ARRAY_TS_FIXED_ARRAY_HPP
 
-#include "array/TSBaseArray.hpp"
-#include "Memory.hpp"
+#include "storm/array/TSBaseArray.hpp"
+#include "storm/Memory.hpp"
 #include <cstdint>
 
 template<class T>

storm/array/TSGrowableArray.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_ARRAY_TS_GROWABLE_ARRAY_HPP
 #define STORM_ARRAY_TS_GROWABLE_ARRAY_HPP
 
-#include "array/TSFixedArray.hpp"
+#include "storm/array/TSFixedArray.hpp"
 #include <algorithm>
 #include <cstdint>
 #include <cstring>

storm/list/TSExplicitList.hpp

@@ -1,8 +1,8 @@
 #ifndef STORM_LIST_TS_EXPLICIT_LIST_HPP
 #define STORM_LIST_TS_EXPLICIT_LIST_HPP
 
-#include "list/TSGetExplicitLink.hpp"
-#include "list/TSList.hpp"
+#include "storm/list/TSGetExplicitLink.hpp"
+#include "storm/list/TSList.hpp"
 #include <cstdlib>
 
 #define STORM_EXPLICIT_LIST(T, link) TSExplicitList<T, offsetof(T, link)>

storm/list/TSGetExplicitLink.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_LIST_TS_GET_EXPLICIT_LINK_HPP
 #define STORM_LIST_TS_GET_EXPLICIT_LINK_HPP
 
-#include "list/TSLink.hpp"
+#include "storm/list/TSLink.hpp"
 #include <cstddef>
 #include <cstdint>
 

storm/list/TSGetLink.hpp

@@ -1,8 +1,8 @@
 #ifndef STORM_LIST_TS_GET_LINK_HPP
 #define STORM_LIST_TS_GET_LINK_HPP
 
-#include "list/TSLink.hpp"
-#include "list/TSLinkedNode.hpp"
+#include "storm/list/TSLink.hpp"
+#include "storm/list/TSLinkedNode.hpp"
 #include <cstddef>
 #include <cstdint>
 

storm/list/TSLinkedNode.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_LIST_TS_LINKED_NODE_HPP
 #define STORM_LIST_TS_LINKED_NODE_HPP
 
-#include "list/TSLink.hpp"
+#include "storm/list/TSLink.hpp"
 
 template <class T>
 class TSLinkedNode {

storm/list/TSList.hpp

@@ -1,9 +1,9 @@
 #ifndef STORM_LIST_TS_LIST_HPP
 #define STORM_LIST_TS_LIST_HPP
 
-#include "Memory.hpp"
-#include "list/TSGetLink.hpp"
-#include "list/TSLink.hpp"
+#include "storm/Memory.hpp"
+#include "storm/list/TSGetLink.hpp"
+#include "storm/list/TSLink.hpp"
 #include <cstddef>
 #include <cstdint>
 

storm/thread/SCritSect.cpp

@@ -1,4 +1,4 @@
-#include "thread/SCritSect.hpp"
+#include "storm/thread/SCritSect.hpp"
 
 void SCritSect::Enter() {
 #if defined(PLATFORM_WIN)

storm/thread/SEvent.cpp

@@ -1,4 +1,4 @@
-#include "thread/SEvent.hpp"
+#include "storm/thread/SEvent.hpp"
 
 SEvent::SEvent(int32_t manualReset, int32_t initialValue)
     : SSyncObject() {

storm/thread/SEvent.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_THREAD_S_EVENT_HPP
 #define STORM_THREAD_S_EVENT_HPP
 
-#include "thread/SSyncObject.hpp"
+#include "storm/thread/SSyncObject.hpp"
 #include <cstdint>
 
 class SEvent : public SSyncObject {

storm/thread/SSyncObject.cpp

@@ -1,4 +1,4 @@
-#include "thread/SSyncObject.hpp"
+#include "storm/thread/SSyncObject.hpp"
 
 #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
 #include <cerrno>

storm/thread/SThread.cpp

@@ -1,5 +1,5 @@
-#include "thread/SThread.hpp"
-#include "Thread.hpp"
+#include "storm/thread/SThread.hpp"
+#include "storm/Thread.hpp"
 
 int32_t SThread::Create(uint32_t (*threadProc)(void*), void* param, SThread& thread, char* threadName, uint32_t a5) {
 #if defined(PLATFORM_WIN)

storm/thread/SThread.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_THREAD_S_THREAD_HPP
 #define STORM_THREAD_S_THREAD_HPP
 
-#include "thread/SSyncObject.hpp"
+#include "storm/thread/SSyncObject.hpp"
 #include <cstdint>
 
 class SThread : public SSyncObject {

storm/thread/S_Thread.cpp

@@ -1,4 +1,4 @@
-#include "thread/S_Thread.hpp"
+#include "storm/thread/S_Thread.hpp"
 
 int32_t S_Thread::s_numthreads;
 

storm/thread/S_Thread.hpp

@@ -1,7 +1,7 @@
 #ifndef STORM_THREAD_S__THREAD_HPP
 #define STORM_THREAD_S__THREAD_HPP
 
-#include "thread/SThread.hpp"
+#include "storm/thread/SThread.hpp"
 #include <cstdint>
 
 typedef SThread SyncObjectData;

storm/thread/mac/SThreadRunner.mm

@@ -1,5 +1,5 @@
-#include "thread/mac/SThreadRunner.h"
-#include "thread/S_Thread.hpp"
+#include "storm/thread/mac/SThreadRunner.h"
+#include "storm/thread/S_Thread.hpp"
 
 @implementation SThreadRunner
 

storm/thread/mac/S_Thread.mm

@@ -1,5 +1,5 @@
-#include "thread/S_Thread.hpp"
-#include "Memory.hpp"
+#include "storm/thread/S_Thread.hpp"
+#include "storm/Memory.hpp"
 
 uint32_t S_Thread::s_SLaunchThread(void* threadParam) {
     // TODO

storm/thread/mac/Thread.mm

@@ -1,8 +1,8 @@
-#include "Thread.hpp"
-#include "Memory.hpp"
-#include "String.hpp"
-#include "thread/S_Thread.hpp"
-#include "thread/mac/SThreadRunner.h"
+#include "storm/Thread.hpp"
+#include "storm/Memory.hpp"
+#include "storm/String.hpp"
+#include "storm/thread/S_Thread.hpp"
+#include "storm/thread/mac/SThreadRunner.h"
 #include <new>
 
 int32_t SCreateThread(uint32_t (*threadProc)(void*), void* threadParam, void* a3, SThread* syncObject, const char* threadName) {

test/Array.cpp

@@ -1,5 +1,5 @@
-#include "Array.hpp"
-#include "Test.hpp"
+#include "storm/Array.hpp"
+#include "test/Test.hpp"
 
 TEST_CASE("TSBaseArray", "[list]") {
     SECTION("constructs correctly") {

test/CMakeLists.txt

@@ -27,8 +27,7 @@ endif()
 
 target_include_directories(StormTest
     PRIVATE
-        ${CMAKE_SOURCE_DIR}/storm
-        ${CMAKE_SOURCE_DIR}/test
+        ${PROJECT_SOURCE_DIR}
 )
 
 install(TARGETS StormTest DESTINATION "bin")

test/List.cpp

@@ -1,5 +1,5 @@
-#include "List.hpp"
-#include "Test.hpp"
+#include "storm/List.hpp"
+#include "test/Test.hpp"
 
 struct TestListNode : TSLinkedNode<TestListNode> {
     uint32_t index = 0;

test/Memory.cpp

@@ -1,5 +1,5 @@
-#include "Memory.hpp"
-#include "Test.hpp"
+#include "storm/Memory.hpp"
+#include "test/Test.hpp"
 
 TEST_CASE("SMemAlloc", "[memory]") {
     SECTION("allocates memory") {

test/Test.cpp

@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "Test.hpp"
+#include "test/Test.hpp"

test/Test.hpp

@@ -1 +1 @@
-#include "catch.hpp"
+#include "test/catch.hpp"