Refactor

.github/workflows/build.yml

@@ -17,21 +17,24 @@ jobs:
         env:
           CC: ${{ matrix.env.CC }}
           CXX: ${{ matrix.env.CXX }}
-        run: |
-          ./.github/actions/build.sh
+        run: ./.github/actions/build.sh
+      - name: Test
+        run: cd build && make test
 
   macOS:
     name: Build on macOS
     strategy:
       matrix:
-        os: [ macos-10.15, macos-11 ]
+        os: [ macos-12 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build
         run: |
           ./.github/actions/build.sh
+      - name: Test
+        run: cd build && make test
 
   windows:
     name: Build on Windows
@@ -62,3 +65,5 @@ jobs:
           CXX: ${{ matrix.env.CXX }}
         run: |
           ./.github/actions/build.sh
+      - name: Test
+        run: cmake --build build --target test

CMakeLists.txt

@@ -24,21 +24,29 @@ project(Graphite CXX)
 
 set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 if (APPLE)
 	set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
 
-include_directories("${PROJECT_SOURCE_DIR}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mavx -msse4.1")
 
-file(GLOB_RECURSE graphite_sources
-	libGraphite/*.cpp
-) 
-add_library(Graphite ${graphite_sources})
+set(PROJECT_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/libs)
 
-file(GLOB_RECURSE graphite_test_sources
-	GraphiteTest/*.cpp
-) 
-add_executable(GraphiteTest ${graphite_test_sources})
-target_link_libraries(GraphiteTest Graphite)
+# Libraries
+add_subdirectory(${PROJECT_LIBS_DIR}/libSIMD)
+add_subdirectory(${PROJECT_LIBS_DIR}/libHashing)
+add_subdirectory(${PROJECT_LIBS_DIR}/libEncoding)
+add_subdirectory(${PROJECT_LIBS_DIR}/libData)
+add_subdirectory(${PROJECT_LIBS_DIR}/libResourceCore)
+add_subdirectory(${PROJECT_LIBS_DIR}/libQuickdraw)
+add_subdirectory(${PROJECT_LIBS_DIR}/libSoundCore)
+add_subdirectory(${PROJECT_LIBS_DIR}/libSpriteWorld)
+add_subdirectory(${PROJECT_LIBS_DIR}/libToolbox)
 
+########################################################################################################################
+
+enable_testing()
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+	add_subdirectory(tests)
+endif()

README.md

@@ -1,6 +1,19 @@
+[![Graphite CI](https://github.com/TheDiamondProject/Graphite/actions/workflows/build.yml/badge.svg)](https://github.com/TheDiamondProject/Graphite/actions/workflows/build.yml) [![Version](https://img.shields.io/badge/version-v1.0-blue.svg)](#) [![Version](https://img.shields.io/badge/license-MIT-blue.svg)](#)
+
 # Graphite
 The Graphite Library is part of _The Diamond Project_ and aims to provide modern, cross platform implementations of various features 
 and aspects of functionality from the Classic Macintosh OS and Carbon Frameworks.
 
+## Using libGraphite
+TBC
+
+## libTesting
+The Graphite library includes a secondary library designed for providing the required functionality for basic unit testing. You can find documentation for this in the `libTesting` directory. Graphite uses this library to test the core functionality and performance of main `libGraphite` library, along with CMake and GitHub Actions to ensure that no regressions occur and that all added functionality is actually correct and verified.
+
+It is provided in such a way that you can use it in your own projects should you wish to.
+
+## Contributing
+TBC
+
 ## License
-Graphite is available under the MIT license.
+Graphite is available under the MIT license, which can be [found here]().