VCPKG And Various Fixes

.github/workflows/build-linux-gcc.yml

@@ -56,26 +56,30 @@ jobs:
                 sudo apt-get install -y \
                     build-essential \
                     nasm \
-                    libogg-dev \
-                    libxft-dev \
+                    git \
+                    curl \
+                    zip \
+                    unzip \
+                    pkg-config \
+                    autoconf \
+                    autoconf-archive \
+                    automake \
+                    make \
+                    libtool \
+                    libltdl-dev \
                     libx11-dev \
-                    libxxf86vm-dev \
-                    libopenal-dev \
-                    libasound2-dev \
-                    libpipewire-0.3-dev \
-                    portaudio19-dev \
-                    oss4-dev \
-                    libjack-dev \
-                    libpulse-dev \
-                    libdbus-1-dev \
-                    libfreetype6-dev \
-                    libxcursor-dev \
-                    libxinerama-dev \
-                    libxi-dev \
-                    libxrandr-dev \
-                    libxss-dev \
-                    libglu1-mesa-dev \
+                    libxft-dev \
+                    libxext-dev \
+                    libwayland-dev \
+                    libxkbcommon-dev \
+                    libegl1-mesa-dev \
+                    libibus-1.0-dev \
                     libgtk-3-dev
+
+                sudo apt-get install -y \
+                    python3
+
+                pip install jinja2
 
 
             - name: Configure, Build & Install
@@ -86,20 +90,20 @@ jobs:
                 c-compiler: ${{matrix.config.cc}}
                 cxx-compiler: ${{matrix.config.cxx}}
                 generator: ${{matrix.config.generator}}
-                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON
+                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} GIT_CI_BUILD=ON TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON TORQUE_LIB_ROOT_DIRECTORY="${{github.workspace}}/Engine/lib"
                 run-build: true
                 build-args: --config ${{matrix.config.build_type}} --target install
 
             - name: Unit Tests
               run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
+                cd "${{github.workspace}}/My_Projects/Torque3D/game"
                 ./Torque3D runTests.tscript
 
             - name: Test Reporter
               uses: phoenix-actions/test-reporting@v14
               with:
                 name: Linux test results
-                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                path: "**/My_Projects/Torque3D/game/test_detail.xml"
                 reporter: java-junit
                 fail-on-error: false
               if: github.event_name != 'pull_request'

.github/workflows/build-macos-clang.yml

@@ -17,10 +17,10 @@ permissions:
   checks: write
 
 jobs:
-    build-linux:
+    build-macos:
         if: github.repository == 'TorqueGameEngines/Torque3D'
         name: ${{matrix.config.name}}
-        runs-on: macos-13
+        runs-on: macos-latest
         strategy:
             fail-fast: false
             matrix:
@@ -48,7 +48,7 @@ jobs:
 
             - name: Install MacOSX Dependencies
               run: |
-                brew install ninja
+                brew install ninja zip unzip curl pkgconfig
                 ninja --version
                 cmake --version
 
@@ -60,20 +60,20 @@ jobs:
                 c-compiler: ${{matrix.config.cc}}
                 cxx-compiler: ${{matrix.config.cxx}}
                 generator: ${{matrix.config.generator}}
-                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON
+                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} GIT_CI_BUILD=ON TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON TORQUE_LIB_ROOT_DIRECTORY="${{github.workspace}}/Engine/lib"
                 run-build: true
                 build-args: --config ${{matrix.config.build_type}} --target install
 
             - name: Unit Tests
               run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
+                cd "${{github.workspace}}/My_Projects/Torque3D/game"
                 ./Torque3D.app/Contents/MacOS/Torque3D runTests.tscript
 
             - name: Test Reporter
               uses: phoenix-actions/test-reporting@v14
               with:
                 name: MacOS Test results
-                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                path: "**/My_Projects/Torque3D/game/test_detail.xml"
                 reporter: java-junit
                 fail-on-error: false
               if: github.event_name != 'pull_request'

.github/workflows/build-windows-msvc.yml

@@ -56,20 +56,20 @@ jobs:
                 c-compiler: ${{matrix.config.cc}}
                 cxx-compiler: ${{matrix.config.cxx}}
                 generator: ${{matrix.config.generator}}
-                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON
+                options: CMAKE_BUILD_TYPE=${{matrix.config.build_type}} GIT_CI_BUILD=ON TORQUE_APP_NAME=Torque3D TORQUE_TESTING=ON TORQUE_LIB_ROOT_DIRECTORY="${{github.workspace}}\\Engine\\lib"
                 run-build: true
                 build-args: --config ${{matrix.config.build_type}} --target install
 
             - name: Unit Tests
               run: |
-                cd "${{github.workspace}}/My Projects/Torque3D/game"
+                cd "${{github.workspace}}/My_Projects/Torque3D/game"
                 ./Torque3D.exe runTests.tscript
 
             - name: Test Reporter
               uses: phoenix-actions/test-reporting@v14
               with:
                 name: Windows test results
-                path: "**/My Projects/Torque3D/game/test_detail.xml"
+                path: "**/My_Projects/Torque3D/game/test_detail.xml"
                 reporter: java-junit
                 fail-on-error: false
               if: github.event_name != 'pull_request'

.gitignore

@@ -180,7 +180,7 @@ pip-log.txt
 console.log
 *.cached.dts
 !Engine/bin
-My Projects/
+My_Projects/
 Project Manager.exe
 projects.xml
 Qt*.dll

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "cmake.configureArgs": [
+        "-DTORQUE_APP_NAME=TestProject"
+    ],
+
+    "cmake.buildDirectory": "${workspaceFolder}/My_Projects/cmake"
+}

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+    "tasks": [
+        {
+            "type": "cppbuild",
+            "label": "C/C++: g++-11 build active file",
+            "command": "/usr/bin/g++-11",
+            "args": [
+                "-fdiagnostics-color=always",
+                "-g",
+                "${file}",
+                "-o",
+                "${fileDirname}/${fileBasenameNoExtension}"
+            ],
+            "options": {
+                "cwd": "${fileDirname}"
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "detail": "Task generated by Debugger."
+        }
+    ],
+    "version": "2.0.0"
+}

CMakeLists.txt

@@ -18,11 +18,11 @@ endif()
 project(${TORQUE_APP_NAME})
 
 # Once an app name is determined, we know what our project pathing structure should look like
-set(TORQUE_APP_ROOT_DIRECTORY "${CMAKE_SOURCE_DIR}/My Projects/${TORQUE_APP_NAME}")
+set(TORQUE_APP_ROOT_DIRECTORY "${CMAKE_SOURCE_DIR}/My_Projects/${TORQUE_APP_NAME}")
 set(TORQUE_APP_GAME_DIRECTORY "${TORQUE_APP_ROOT_DIRECTORY}/game")
 
 #library handling
-set(TORQUE_LIB_ROOT_DIRECTORY "${CMAKE_SOURCE_DIR}/Engine/lib")
+set(TORQUE_LIB_ROOT_DIRECTORY "${CMAKE_SOURCE_DIR}/Engine/lib" CACHE STRING "" FORCE)
 set(TORQUE_LIB_TARG_DIRECTORY "${CMAKE_BINARY_DIR}/Engine/lib")
 set(TORQUE_SOURCE_DIRECTROY "${CMAKE_SOURCE_DIR}/Engine/source")
 
@@ -67,9 +67,17 @@ endif()
 
 if (NOT TORQUE_INSTALLED_TEMPLATE)
     installTemplate(${TORQUE_TEMPLATE})
-    set(TORQUE_INSTALLED_TEMPLATE TRUE CACHE BOOL "Whether or not the game template is installed. This may be reset to false (or removed) to force a reinstall.")
+    set(TORQUE_INSTALLED_TEMPLATE TRUE CACHE BOOL "Whether or not the game template is installed. This may be reset to false (or removed) to force a reinstall." FORCE)
 endif(NOT TORQUE_INSTALLED_TEMPLATE)
 
+# Add a "sync back" target
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}")
+set(DEST_DIR "${TORQUE_APP_ROOT_DIRECTORY}")
+add_custom_target(sync_${TORQUE_TEMPLATE}_back
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${DEST_DIR}" "${SRC_DIR}"
+    COMMENT "Syncing modified ${TORQUE_TEMPLATE} files back to Templates..."
+)
+
 # Generate torqueConfig.h in our temp directory
 configure_file("${CMAKE_SOURCE_DIR}/Tools/CMake/torqueConfig.h.in" "${TORQUE_APP_ROOT_DIRECTORY}/source/torqueConfig.h")