Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
40 changes: 20 additions & 20 deletions .github/workflows/build-linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,31 @@ 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
uses: threeal/cmake-action@v1.3.0
Expand All @@ -90,7 +90,7 @@ 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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-macos-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
checks: write

jobs:
build-linux:
build-macos:
if: github.repository == 'TorqueGameEngines/Torque3D'
name: ${{matrix.config.name}}
runs-on: macos-latest
Expand Down Expand Up @@ -60,7 +60,7 @@ 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

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build-windows-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: ilammy/msvc-dev-cmd@v1.13.0
- name: Print env
run: |
echo github.event.action: ${{ github.event.action }}
echo github.event_name: ${{ github.event_name }}

- name: Run GIT Init
run: git init

- name: Setup MSVC problem matcher
uses: ammaraskar/msvc-problem-matcher@master

Expand All @@ -56,7 +55,7 @@ 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

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Tools/vcpkg"]
path = Tools/vcpkg
url = https://github.com/microsoft/vcpkg.git
27 changes: 27 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@ endif()


include("${CMAKE_SOURCE_DIR}/Tools/CMake/torque_macros.cmake")


if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
set(CMAKE_TOOLCHAIN_FILE
"${CMAKE_SOURCE_DIR}/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake"
CACHE STRING "vcpkg toolchain")
endif()

# Read-only by default — regular users just get cache hits
set(ENV{VCPKG_BINARY_SOURCES}
"clear;files,${CMAKE_CURRENT_LIST_DIR}/Tools/vcpkg-binaries,read")
set(ENV{VCPKG_ASSET_SOURCES}
"clear;x-azurl,file://${CMAKE_CURRENT_LIST_DIR}/Tools/vcpkg-assets,,read")

# Maintainer override — cmake -DTORQUE_POPULATE_VCPKG_CACHE=ON
if(TORQUE_POPULATE_VCPKG_CACHE)
message(STATUS "[vcpkg] Cache mode: READWRITE (populating cache)")
set(ENV{VCPKG_BINARY_SOURCES}
"clear;files,${CMAKE_CURRENT_LIST_DIR}/Tools/vcpkg-binaries,readwrite")
set(ENV{VCPKG_ASSET_SOURCES}
"clear;x-azurl,file://${CMAKE_CURRENT_LIST_DIR}/Tools/vcpkg-assets,,readwrite")
else()
message(STATUS "[vcpkg] Cache mode: READ (using committed cache)")
endif()

set(ENV{VCPKG_KEEP_ENV_VARS} "VCPKG_BINARY_SOURCES;VCPKG_ASSET_SOURCES")

include("${CMAKE_SOURCE_DIR}/Tools/CMake/torque_configs.cmake")

# Ensure multi-core compilation is enabled for everything
Expand Down
Loading
Loading