Skip to content

Commit f9587d4

Browse files
jubejube
committed
Merge branch 'release-0.22.0'
2 parents 0da7621 + 739008e commit f9587d4

File tree

448 files changed

+1962
-1604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+1962
-1604
lines changed

‎.github/workflows/ubuntu.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: UbuntuBuild
2+
3+
on:
4+
push:
5+
branches: [ master, develop ]
6+
pull_request:
7+
branches: [ master, develop ]
8+
9+
env:
10+
BUILD_TYPE: Release
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Install dependencies
17+
run: |
18+
sudo apt update
19+
sudo apt install -y libsdl2-dev libboost-dev libfreetype6-dev zlib1g-dev libpugixml-dev
20+
21+
- name: Extract branch name
22+
shell: bash
23+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
24+
id: extract_branch
25+
26+
- uses: actions/checkout@v2
27+
with:
28+
repository: GamedevFramework/gf
29+
submodules: recursive
30+
ref: ${{ steps.extract_branch.outputs.branch }}
31+
32+
- name: Configure gf
33+
run: cmake -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DGF_SINGLE_COMPILTATION_UNIT=OFF -DGF_DEBUG=OFF -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -S ${{ github.workspace }} -B ${{ github.workspace }}/build
34+
35+
- name: Build gf
36+
run: cmake --build ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --parallel
37+
38+
- name: Run tests
39+
working-directory: ${{ github.workspace }}/build
40+
run: ctest -C ${{ env.BUILD_TYPE }} -T test --output-on-failure
41+
42+
- name: Create deb file
43+
working-directory: ${{github.workspace}}/build
44+
run: cpack --config CPackConfig.cmake -C ${{env.BUILD_TYPE}}
45+
46+
- uses: actions/upload-artifact@v2
47+
with:
48+
name: deb-file
49+
path: ${{github.workspace}}/build/*.deb
50+
if-no-files-found: error

‎.github/workflows/windows.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: WindowsBuild
2+
3+
on:
4+
push:
5+
branches: [ master, develop ]
6+
pull_request:
7+
branches: [ master, develop ]
8+
9+
env:
10+
BUILD_TYPE: Release
11+
VCPKG_COMMIT: 5568f110b509a9fd90711978a7cb76bae75bb092
12+
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg\binary-cache
13+
14+
jobs:
15+
build:
16+
runs-on: windows-latest
17+
steps:
18+
- name: vcpkg cache
19+
id: cache-vcpkg
20+
uses: actions/[email protected]
21+
with:
22+
path: vcpkg
23+
key: ${{ runner.os }}-vcpkg-${{ env.VCPKG_COMMIT }}-v3
24+
25+
- uses: actions/checkout@v2
26+
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
27+
with:
28+
repository: Microsoft/vcpkg
29+
path: vcpkg
30+
ref: ${{ env.VCPKG_COMMIT }}
31+
32+
- name: Install vcpkg dependencies
33+
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
34+
working-directory: ${{github.workspace}}/vcpkg
35+
run: |
36+
echo $Env:VCPKG_DEFAULT_BINARY_CACHE
37+
mkdir $Env:VCPKG_DEFAULT_BINARY_CACHE
38+
.\bootstrap-vcpkg.bat
39+
.\vcpkg.exe install boost-algorithm:x64-windows boost-container:x64-windows boost-filesystem:x64-windows boost-heap:x64-windows freetype:x64-windows pugixml:x64-windows sdl2:x64-windows stb:x64-windows zlib:x64-windows
40+
41+
- name: Extract branch name
42+
shell: bash
43+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
44+
id: extract_branch
45+
46+
- uses: actions/checkout@v2
47+
with:
48+
repository: GamedevFramework/gf
49+
submodules: recursive
50+
ref: ${{ steps.extract_branch.outputs.branch }}
51+
path: gf
52+
53+
- name: Configure gf
54+
shell: cmd
55+
run: |
56+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
57+
cmake -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF -DGF_BUILD_DOCUMENTATION=OFF -DGF_SINGLE_COMPILTATION_UNIT=OFF -DGF_DEBUG=OFF -DGF_VCPKG=ON -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -S ${{ github.workspace }}/gf -B ${{ github.workspace }}/gf/build
58+
59+
- name: Build gf
60+
shell: cmd
61+
run: |
62+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
63+
cmake --build ${{ github.workspace }}/gf/build --config ${{ env.BUILD_TYPE }} --parallel
64+
65+
- name: Run tests
66+
shell: cmd
67+
working-directory: ${{ github.workspace }}/gf/build
68+
run: |
69+
set PATH=%PATH%;${{github.workspace}}/gf/build/library/${{ env.BUILD_TYPE }}
70+
ctest -j $(nproc) -C ${{ env.BUILD_TYPE }} --output-on-failure

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
build*/
2-
2+
.vscode/

‎CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10)
22

33
project(GF
4-
VERSION 0.21.0
4+
VERSION 0.22.0
55
LANGUAGES CXX C
66
)
77

@@ -109,6 +109,18 @@ install(
109109
PATTERN "CMakeLists.txt" EXCLUDE
110110
)
111111

112+
if (UNIX AND NOT APPLE)
113+
set(CPACK_PACKAGE_FILE_NAME "gf-dev-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}")
114+
string(TOLOWER "${CPACK_PACKAGE_FILE_NAME}" CPACK_PACKAGE_FILE_NAME)
115+
set(CPACK_DEBIAN_PACKAGE_NAME "gf-dev")
116+
set(CPACK_GENERATOR "DEB")
117+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl2-dev,libboost-dev,libfreetype6-dev,zlib1g-dev,libpugixml-dev")
118+
set(CPACK_PACKAGE_DESCRIPTION "Gamedev Framework (gf) is a framework to build 2D games in C++17. It is based on SDL and OpenGL ES 2.0, and presents an API that is very similar to the graphics module of SFML with additional features.")
119+
set(CPACK_PACKAGE_CONTACT "Julien Bernard [email protected]")
120+
121+
include(CPack)
122+
endif()
123+
112124
if (GF_BUILD_DOCUMENTATION)
113125
find_package(Doxygen)
114126

‎ChangeLog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# ChangeLog for gf
22

3+
## gf 0.22.0 (14 Jan 2022)
4+
5+
- Core (gf::core)
6+
- Replace Mersenne Twister with xoshiro256++
7+
- Update OpenSimplex implementation
8+
- Fix a bug in TMX CSV parsing
9+
- Graphics (gf::graphics)
10+
- Network (gf::net)
11+
- Misc
12+
- Remove Buddy.works as CI
13+
- Add Github Actions for building on Linux and Windows
14+
315
## gf 0.21.0 (14 Jul 2021)
416

517
- Core (gf::core)

0 commit comments

Comments
 (0)