thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2025-12-12 02:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(build): improve include paths

Browse source
This commit is contained in:
fallenoak 2020-11-01 17:45:45 -06:00
parent 3d5794ed7c
commit 118d20c49d
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
30 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storm/Array.hpp
View file

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

2
storm/CMakeLists.txt
View file

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

8
storm/List.hpp
View file

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

2
storm/Memory.cpp
View file

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

4
storm/String.cpp
View file

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

8
storm/Thread.hpp
View file

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

4
storm/array/TSFixedArray.hpp
View file

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

2
storm/array/TSGrowableArray.hpp
View file

@ -1,7 +1,7 @@
#ifndef STORM_ARRAY_TS_GROWABLE_ARRAY_HPP #ifndef STORM_ARRAY_TS_GROWABLE_ARRAY_HPP
#define 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 <algorithm>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>

4
storm/list/TSExplicitList.hpp
View file

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

2
storm/list/TSGetExplicitLink.hpp
View file

@ -1,7 +1,7 @@
#ifndef STORM_LIST_TS_GET_EXPLICIT_LINK_HPP #ifndef STORM_LIST_TS_GET_EXPLICIT_LINK_HPP
#define 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 <cstddef>
#include <cstdint> #include <cstdint>

4
storm/list/TSGetLink.hpp
View file

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

2
storm/list/TSLinkedNode.hpp
View file

@ -1,7 +1,7 @@
#ifndef STORM_LIST_TS_LINKED_NODE_HPP #ifndef STORM_LIST_TS_LINKED_NODE_HPP
#define 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> template <class T>
class TSLinkedNode { class TSLinkedNode {

6
storm/list/TSList.hpp
View file

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

2
storm/thread/SCritSect.cpp
View file

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

2
storm/thread/SEvent.cpp
View file

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

2
storm/thread/SEvent.hpp
View file

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

2
storm/thread/SSyncObject.cpp
View file

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

4
storm/thread/SThread.cpp
View file

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

2
storm/thread/SThread.hpp
View file

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

2
storm/thread/S_Thread.cpp
View file

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

2
storm/thread/S_Thread.hpp
View file

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

4
storm/thread/mac/SThreadRunner.mm
View file

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

4
storm/thread/mac/S_Thread.mm
View file

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

10
storm/thread/mac/Thread.mm
View file

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

4
test/Array.cpp
View file

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

3
test/CMakeLists.txt
View file

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

4
test/List.cpp
View file

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

4
test/Memory.cpp
View file

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

2
test/Test.cpp
View file

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

2
test/Test.hpp
View file

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