Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipagaxi patch 1 #30

Merged
merged 33 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5c41ce5
Create cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
26fdeaa
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
34f81b2
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
b3c072b
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
a3a2372
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
31d3843
Merge pull request #27 from Ipagaxi/Ipagaxi-patch-1
Ipagaxi Mar 10, 2024
0375f37
Update cmake-multi-platform.yml
Ipagaxi Mar 10, 2024
ab5d632
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
6f3bce3
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
f42bba2
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
2de548a
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
d93a497
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
4ca2719
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
08e67ea
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
27dbc3c
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
afebfed
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
cf46f20
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 10, 2024
6547b04
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
964ed73
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
ab3a36c
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
6d248de
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
d262f75
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
82d2490
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
6c12323
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
7ac64ab
Update CMakeLists.txt
Ipagaxi Mar 11, 2024
087837f
Update CMakeLists.txt
Ipagaxi Mar 11, 2024
9eca751
Update cmake-multi-platform-make-release.yml
Ipagaxi Mar 11, 2024
80bc87d
Update cmake-multi-platform.yml
Ipagaxi Mar 11, 2024
0de1b67
Update CMakeLists.txt
Ipagaxi Mar 11, 2024
b0b3ea9
Ipagaxi patch 2 (#31)
Ipagaxi Mar 11, 2024
ae8374f
Merge branch 'release' into Ipagaxi-patch-1
Ipagaxi Mar 11, 2024
829b175
Now resources (images, sounds etc.) are copied to project_build durin…
Ipagaxi Mar 11, 2024
12383a3
...
Ipagaxi Mar 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 123 additions & 0 deletions .github/workflows/cmake-multi-platform-make-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
name: Create Releases

on:
pull_request:
branches: release

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false

# Set up a matrix to run the following 3 configurations:
# 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
# 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
# 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest]
build_type: [Release]
c_compiler: [gcc, clang, cl]
include:
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
- os: ubuntu-latest
c_compiler: gcc
cpp_compiler: g++
- os: ubuntu-latest
c_compiler: clang
cpp_compiler: clang++
exclude:
- os: windows-latest
c_compiler: gcc
- os: windows-latest
c_compiler: clang
- os: ubuntu-latest
c_compiler: cl

steps:
- uses: actions/checkout@v3

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
id: strings
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"

- name: Create Build Output Directory
run: mkdir ./project_build

- name: Install development libraries (Ubuntu/Debian)
if: matrix.os == 'ubuntu-latest'
run: sudo apt update && sudo apt install libopenal-dev libxcursor-dev libfreetype6-dev libx11-dev libxrandr-dev libudev-dev libglu1-mesa-dev libflac-dev libogg-dev libvorbis-dev

- uses: actions/cache@v3
with:
path: ${{ steps.strings.outputs.build-output-dir }}
key: ${{ runner.os }}-build-${{ matrix.build_type }}
restore-keys: |
${{ runner.os }}-build-
- name: Configure CMake (on Linux)
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
if: runner.os == 'Linux'
run: >
sudo cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_INSTALL_PREFIX=./project_build
-S ${{ github.workspace }}

- name: Configure CMake (on Windows)
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
if: runner.os == 'Windows'
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-S ${{ github.workspace }}

- name: Build (Linux)
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
if: runner.os == 'Linux'
run: sudo cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target install

- name: Build (Windows)
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
if: runner.os == 'Windows'
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target install

- uses: actions/upload-artifact@v3 # Upload build artifacts
with:
name: ${{ runner.os }}_build # Name for the artifact cache
path: ./project_build # Path containing built artifacts

# - name: Create Release # Create the release on GitHub
# id: create_release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
# with:
# tag_name: v1.0.0 # Use the commit SHA for the tag
# release_name: "Pre-Alpha-Demo v1.0.0" # Release name
# prerelease: false # Set to true for pre-releases (optional)

# - name: Upload Release # Create release on merge
# id: upload-release-asset
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
# with:
# upload_url: ${{ steps.create_release.outputs.upload_url }}
# asset_name: "${{ github.event.repository.name }}_${{ matrix.os }}.zip" # Filename for the artifact archive
# asset_path: ./built-project # Path to the downloaded artifacts
# asset_content_type: application/zip
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ out
.cache
.idea
.vs
.vscode
.vscode
project_build
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ file(GLOB source_files
)
set(SOURCES ${source_files})

set(CMAKE_INSTALL_PREFIX project_build)
set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/project_build)
message (STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")

file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
Expand Down Expand Up @@ -43,4 +43,11 @@ if(WIN32)
VERBATIM)
endif()

add_custom_command(
TARGET ${PROJECT_NAME}
COMMENT "Copy resources"
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/src/resources $<TARGET_FILE_DIR:${PROJECT_NAME}>/resources
VERBATIM)

install(TARGETS ${PROJECT_NAME})
install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/resources DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Binary file removed Release/bin/PnC.exe
Binary file not shown.
Binary file removed Release/bin/openal32.dll
Binary file not shown.
56 changes: 0 additions & 56 deletions Release/include/SFML/Audio.hpp

This file was deleted.

70 changes: 0 additions & 70 deletions Release/include/SFML/Audio/AlResource.hpp

This file was deleted.

48 changes: 0 additions & 48 deletions Release/include/SFML/Audio/Export.hpp

This file was deleted.

Loading
Loading