Merge Dev

.github/workflows/Xmake.yml

@@ -0,0 +1,53 @@
+name: XMake Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 5
+    strategy:
+      fail-fast: false
+      matrix:
+        build_configuration: [debug, release]  # Build both configurations
+        architecture: [x64]
+
+    steps:
+    - name: Checkout Repository with Submodules
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive  # Fetch submodules recursively
+        fetch-depth: 0  # Ensures a full clone (needed for some submodules)
+
+    - name: Initialize and Update Submodules (if needed)
+      run: |
+        git submodule sync --recursive
+        git submodule update --init --recursive
+
+    - name: Install XMake
+      uses: xmake-io/github-action-setup-xmake@v1
+      with:
+        xmake-version: latest
+
+    - name: Configure XMake
+      run: |
+        xmake f -m ${{ matrix.build_configuration }} -a ${{ matrix.architecture }}
+
+    - name: Build with XMake
+      run: |
+        xmake build
+
+    - name: Upload Build Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.build_configuration }}
+        path: Build/${{ matrix.build_configuration }}/Internal/Internal.dll
+

.gitignore

@@ -399,4 +399,6 @@ FodyWeavers.xsd
 
 .vscode
 
-OmegaWare Framework/enc_temp_folder
+OmegaWare Framework/enc_temp_folder
+
+Internal/Libs

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "Internal/Libs/Nlohmann.json"]
 	path = Internal/Libs/Nlohmann.json
 	url = https://github.com/nlohmann/json.git
+[submodule "Internal/Libs/FreeType"]
+	path = Internal/Libs/FreeType
+	url = https://github.com/OmegaWareProjects/freetype.git

Internal/FrameworkConfig.h

@@ -46,6 +46,9 @@
 #pragma once
 #pragma execution_character_set("utf-8")
 
+#define STRR(X) #X  
+#define STR(X) STRR(X)
+
 #define FRAMEWORK_MAJOR_VERSION 6
 #define FRAMEWORK_MINOR_VERSION 9
 #define FRAMEWORK_REWORK_VERSION 1