Compare commits
6
Commits
d3f8942fbf
...
v0.31.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b68e5567b8 | ||
|
|
42dcf7c888 | ||
|
|
403dbc7791 | ||
|
|
5255fd3a77 | ||
|
|
0107cf13c3 | ||
|
|
ee7b1d4299 |
@@ -1 +0,0 @@
|
||||
custom: ['https://boosty.to/mihailris']
|
||||
@@ -59,7 +59,7 @@ jobs:
|
||||
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
||||
with:
|
||||
recipe: dev/AppImageBuilder.yml
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: AppImage
|
||||
path: './*.AppImage*'
|
||||
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
# make && make install INSTALL_INC=/usr/include/lua
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
|
||||
sudo apt-get install -y cmake build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
|
||||
# fix luajit paths
|
||||
sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a
|
||||
sudo ln -s /usr/include/luajit-2.1 /usr/include/lua
|
||||
@@ -68,7 +68,7 @@ jobs:
|
||||
run: ctest --test-dir ${{github.workspace}}/build
|
||||
- name: Upload artifacts
|
||||
if: ${{ inputs.upload_artifacts }}
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: VoxelEngine
|
||||
path: |
|
||||
|
||||
@@ -55,7 +55,7 @@ jobs:
|
||||
hdiutil create VoxelEngineMacApp.dmg -volname "VoxelEngine" -srcfolder VoxelEngineDmgContent -ov -format UDZO
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: VoxelEngineMacOs
|
||||
path: VoxelEngineMacApp.dmg
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
name: Release
|
||||
name: Build and Release
|
||||
run-name: ${{ github.actor }} preparing release
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
@@ -7,7 +11,7 @@ on:
|
||||
required: true
|
||||
default: "0.0.0"
|
||||
env:
|
||||
RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }}
|
||||
RELEASE_VERSION: ${{ github.event.inputs.version || github.ref_name || 'testrelease' }}
|
||||
BRANCH_NAME: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || 'main' }}
|
||||
jobs:
|
||||
prepare:
|
||||
@@ -40,7 +44,7 @@ jobs:
|
||||
with:
|
||||
ref: ${{ env.BRANCH_NAME }}
|
||||
- name: Download Build Artifact
|
||||
uses: actions/download-artifact@v4
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
path: ./artifacts
|
||||
- name: Show Artifacts
|
||||
@@ -54,21 +58,35 @@ jobs:
|
||||
ls -la ./release
|
||||
tree ./release
|
||||
- name: Create Tag
|
||||
if: github.event_name == 'workflow_dispatch'
|
||||
run: |
|
||||
git config --local user.email "action@github.com"
|
||||
git config --local user.name "GitHub Action"
|
||||
git config --local user.email "action@gitea.com"
|
||||
git config --local user.name "Gitea Action"
|
||||
|
||||
TAG_NAME="v${RELEASE_VERSION}"
|
||||
git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
|
||||
git push origin "${TAG_NAME}"
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Create Release Draft
|
||||
uses: softprops/action-gh-release@v2
|
||||
- name: Create Release with assets
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
tag_name: v${{ env.RELEASE_VERSION }}
|
||||
name: VoxelCore v${{ env.RELEASE_VERSION }}
|
||||
body: |
|
||||
## VoxelCore Release ${{ env.RELEASE_VERSION }}
|
||||
|
||||
### Downloads
|
||||
- **Linux**: voxelcore-${{ env.RELEASE_VERSION }}_x86-64.AppImage
|
||||
- **macOS**: voxelcore-${{ env.RELEASE_VERSION }}_macos.dmg
|
||||
- **Windows**: voxelcore-${{ env.RELEASE_VERSION }}_win64.zip
|
||||
|
||||
### Installation
|
||||
Download the appropriate file for your platform and run it.
|
||||
|
||||
---
|
||||
**Full Changelog**: https://git.pyserve.org/PulseStudio/VoxelEngine/compare/v0.0.0...v${{ env.RELEASE_VERSION }}
|
||||
draft: true
|
||||
prerelease: false
|
||||
files: |
|
||||
./release/*
|
||||
generate_release_notes: true
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
cp build/*.dll packaged/
|
||||
cp -r build/res/* packaged/res/
|
||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'packaged/*'
|
||||
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||
working-directory: ${{ github.workspace }}
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'packaged/*'
|
||||
|
||||
@@ -14,6 +14,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
find_package(OpenAL CONFIG REQUIRED)
|
||||
else()
|
||||
find_package(OpenAL REQUIRED)
|
||||
# Create OpenAL::OpenAL alias if not exists
|
||||
if(NOT TARGET OpenAL::OpenAL AND TARGET OpenAL::AL)
|
||||
add_library(OpenAL::OpenAL ALIAS OpenAL::AL)
|
||||
elseif(NOT TARGET OpenAL::OpenAL AND OPENAL_FOUND)
|
||||
add_library(OpenAL::OpenAL INTERFACE IMPORTED)
|
||||
set_target_properties(OpenAL::OpenAL PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${OPENAL_INCLUDE_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "${OPENAL_LIBRARY}")
|
||||
endif()
|
||||
endif()
|
||||
find_package(ZLIB REQUIRED)
|
||||
find_package(PNG REQUIRED)
|
||||
|
||||
@@ -35,7 +35,9 @@ namespace util {
|
||||
std::shared_ptr<T> create(Args&&... args) {
|
||||
std::lock_guard lock(mutex);
|
||||
if (freeObjects.empty()) {
|
||||
if (!allocateNew()) {
|
||||
try {
|
||||
allocateNew();
|
||||
} catch (const std::bad_alloc&) {
|
||||
return std::make_shared<T>(std::forward<Args>(args)...);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user