Skip to content

Commit c9bcd69

Browse files
eXpl0it3reXpl0it3r
authored
Merge branch '2.6.x' into master
2 parents 58cd82b + a7b113a commit c9bcd69

File tree

4 files changed

+321
-5
lines changed

4 files changed

+321
-5
lines changed

‎.github/workflows/release.yml

Lines changed: 316 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,316 @@
1+
name: Release Builds
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- 2.6.x
8+
tags:
9+
- "**"
10+
workflow_dispatch: {}
11+
12+
concurrency:
13+
group: release-${{github.ref}}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
windows-x86:
18+
name: Windows x86
19+
runs-on: windows-2022
20+
21+
steps:
22+
- name: Cache MinGW x86
23+
id: mingw-x86-cache
24+
uses: actions/cache@v4
25+
with:
26+
path: ${{ github.workspace }}/mingw32
27+
key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x86
28+
29+
- name: Install MinGW x86
30+
if: steps.mingw-x86-cache.outputs.cache-hit != 'true'
31+
uses: bwoodsend/setup-winlibs-action@v1
32+
id: winlibs-32
33+
with:
34+
tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
35+
with_clang: false
36+
architecture: 32
37+
destination: ${{ github.workspace }}
38+
add_to_path: false
39+
40+
- name: Checkout SFML
41+
uses: actions/checkout@v4
42+
with:
43+
repository: SFML/SFML
44+
ref: 2.6.1
45+
path: SFML
46+
47+
- name: Checkout CSFML
48+
uses: actions/checkout@v4
49+
with:
50+
path: CSFML
51+
52+
- name: Build SFML
53+
run: |
54+
cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
55+
cmake --build SFML-build --config Release --target install
56+
57+
- name: Build CSFML
58+
run: |
59+
cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
60+
cmake --build CSFML-build --config Release --target install
61+
62+
- name: Add MinGW to PATH
63+
shell: bash
64+
run: echo "${{ github.workspace }}\mingw32\bin" >> $GITHUB_PATH
65+
66+
- name: Generate Import Libs for MinGW
67+
shell: pwsh
68+
run: |
69+
New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
70+
New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
71+
Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
72+
73+
Push-Location CSFML-install\lib\gcc
74+
& gendef.exe "..\..\bin\csfml-graphics-2.dll"
75+
& dlltool.exe -d "csfml-graphics-2.def" -D "..\..\bin\csfml-graphics-2.dll" -l "libcsfml-graphics.a"
76+
Remove-Item -Path "csfml-graphics-2.def"
77+
78+
& gendef.exe "..\..\bin\csfml-window-2.dll"
79+
& dlltool.exe -d "csfml-window-2.def" -D "..\..\bin\bin\csfml-window-2.dll" -l "libcsfml-window.a"
80+
Remove-Item -Path "csfml-window-2.def"
81+
82+
& gendef.exe "..\..\bin\csfml-audio-2.dll"
83+
& dlltool.exe -d "csfml-audio-2.def" -D "..\..\bin\bin\csfml-audio-2.dll" -l "libcsfml-audio.a"
84+
Remove-Item -Path "csfml-audio-2.def"
85+
86+
& gendef.exe "..\..\bin\csfml-network-2.dll"
87+
& dlltool.exe -d "csfml-network-2.def" -D "..\..\bin\bin\csfml-network-2.dll" -l "libcsfml-network.a"
88+
Remove-Item -Path "csfml-network-2.def"
89+
90+
& gendef.exe "..\..\bin\csfml-system-2.dll"
91+
& dlltool.exe -d "csfml-system-2.def" -D "..\..\bin\bin\csfml-system-2.dll" -l "libcsfml-system.a"
92+
Remove-Item -Path "csfml-system-2.def"
93+
Pop-Location
94+
95+
New-Item -ItemType "directory" -PATH "install"
96+
Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
97+
98+
- name: Upload Artifact
99+
uses: actions/upload-artifact@v4
100+
with:
101+
name: CSFML-windows-32-bit
102+
path: install/CSFML
103+
104+
windows-x64:
105+
name: Windows x64
106+
runs-on: windows-2022
107+
108+
steps:
109+
- name: Cache MinGW x64
110+
id: mingw-x64-cache
111+
uses: actions/cache@v4
112+
with:
113+
path: ${{ github.workspace }}/mingw64
114+
key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x64
115+
116+
- name: Install MinGW x64
117+
if: steps.mingw-x64-cache.outputs.cache-hit != 'true'
118+
uses: bwoodsend/setup-winlibs-action@v1
119+
id: winlibs-64
120+
with:
121+
tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
122+
with_clang: false
123+
architecture: 64
124+
destination: ${{ github.workspace }}
125+
add_to_path: false
126+
127+
- name: Checkout SFML
128+
uses: actions/checkout@v4
129+
with:
130+
repository: SFML/SFML
131+
ref: 2.6.1
132+
path: SFML
133+
134+
- name: Checkout CSFML
135+
uses: actions/checkout@v4
136+
with:
137+
path: CSFML
138+
139+
- name: Build SFML
140+
run: |
141+
cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
142+
cmake --build SFML-build --config Release --target install
143+
144+
- name: Build CSFML
145+
run: |
146+
cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
147+
cmake --build CSFML-build --config Release --target install
148+
149+
- name: Add MinGW to PATH
150+
shell: bash
151+
run: echo "${{ github.workspace }}\mingw64\bin" >> $GITHUB_PATH
152+
153+
- name: Generate Import Libs for MinGW
154+
shell: pwsh
155+
run: |
156+
New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
157+
New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
158+
Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
159+
160+
Push-Location CSFML-install\lib\gcc
161+
& gendef.exe "..\..\bin\csfml-graphics-2.dll"
162+
& dlltool.exe -d "csfml-graphics-2.def" -D "..\..\bin\csfml-graphics-2.dll" -l "libcsfml-graphics.a"
163+
Remove-Item -Path "csfml-graphics-2.def"
164+
165+
& gendef.exe "..\..\bin\csfml-window-2.dll"
166+
& dlltool.exe -d "csfml-window-2.def" -D "..\..\bin\bin\csfml-window-2.dll" -l "libcsfml-window.a"
167+
Remove-Item -Path "csfml-window-2.def"
168+
169+
& gendef.exe "..\..\bin\csfml-audio-2.dll"
170+
& dlltool.exe -d "csfml-audio-2.def" -D "..\..\bin\bin\csfml-audio-2.dll" -l "libcsfml-audio.a"
171+
Remove-Item -Path "csfml-audio-2.def"
172+
173+
& gendef.exe "..\..\bin\csfml-network-2.dll"
174+
& dlltool.exe -d "csfml-network-2.def" -D "..\..\bin\bin\csfml-network-2.dll" -l "libcsfml-network.a"
175+
Remove-Item -Path "csfml-network-2.def"
176+
177+
& gendef.exe "..\..\bin\csfml-system-2.dll"
178+
& dlltool.exe -d "csfml-system-2.def" -D "..\..\bin\bin\csfml-system-2.dll" -l "libcsfml-system.a"
179+
Remove-Item -Path "csfml-system-2.def"
180+
Pop-Location
181+
182+
New-Item -ItemType "directory" -PATH "install"
183+
Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
184+
185+
- name: Upload Artifact
186+
uses: actions/upload-artifact@v4
187+
with:
188+
name: CSFML-windows-64-bit
189+
path: install/CSFML
190+
191+
macos-x64:
192+
name: macOS x64
193+
runs-on: macos-12
194+
195+
steps:
196+
- name: Checkout SFML
197+
uses: actions/checkout@v4
198+
with:
199+
repository: SFML/SFML
200+
ref: 2.6.1
201+
path: SFML
202+
203+
- name: Checkout CSFML
204+
uses: actions/checkout@v4
205+
with:
206+
path: CSFML
207+
208+
- name: Build SFML
209+
run: |
210+
cmake -S SFML -B SFML-build -G "Unix Makefiles" \
211+
-DCMAKE_C_COMPILER="/usr/bin/clang" \
212+
-DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
213+
-DCMAKE_C_FLAGS="-stdlib=libc++" \
214+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
215+
-DBUILD_SHARED_LIBS=TRUE \
216+
-DCMAKE_BUILD_TYPE=Release \
217+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
218+
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
219+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
220+
-DSFML_BUILD_FRAMEWORKS=TRUE \
221+
-DCMAKE_VERBOSE_MAKEFILE=ON
222+
cmake --build SFML-build --config Release --target install
223+
224+
- name: Build CSFML
225+
run: |
226+
cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
227+
-DCMAKE_C_COMPILER="/usr/bin/clang" \
228+
-DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
229+
-DCMAKE_C_FLAGS="-stdlib=libc++" \
230+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
231+
-DBUILD_SHARED_LIBS=TRUE \
232+
-DCSFML_LINK_SFML_STATICALLY=FALSE \
233+
-DCMAKE_BUILD_TYPE=Release \
234+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
235+
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
236+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
237+
-DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
238+
-DCMAKE_VERBOSE_MAKEFILE=ON
239+
cmake --build CSFML-build --config Release --target install
240+
241+
- name: Create Archive
242+
run: |
243+
mkdir CSFML-macOS-clang-64-bit
244+
cp -R CSFML-install/include CSFML-macOS-clang-64-bit
245+
cp -R CSFML-install/lib CSFML-macOS-clang-64-bit
246+
cp CSFML-install/share/CSFML/* CSFML-macOS-clang-64-bit
247+
tar -zcvf CSFML-macOS-clang-64-bit.tar.gz CSFML-macOS-clang-64-bit
248+
249+
- name: Upload Artifact
250+
uses: actions/upload-artifact@v4
251+
with:
252+
name: CSFML-macOS-clang-64-bit
253+
path: CSFML-macOS-clang-64-bit.tar.gz
254+
255+
macos-arm64:
256+
name: macOS ARM64
257+
runs-on: macos-14
258+
259+
steps:
260+
- name: Checkout SFML
261+
uses: actions/checkout@v4
262+
with:
263+
repository: SFML/SFML
264+
ref: 2.6.1
265+
path: SFML
266+
267+
- name: Checkout CSFML
268+
uses: actions/checkout@v4
269+
with:
270+
path: CSFML
271+
- name: Build SFML
272+
run: |
273+
cmake -S SFML -B SFML-build -G "Unix Makefiles" \
274+
-DCMAKE_C_COMPILER="/usr/bin/clang" \
275+
-DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
276+
-DCMAKE_C_FLAGS="-stdlib=libc++" \
277+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
278+
-DBUILD_SHARED_LIBS=TRUE \
279+
-DCMAKE_BUILD_TYPE=Release \
280+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
281+
-DCMAKE_OSX_ARCHITECTURES=arm64 \
282+
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
283+
-DSFML_BUILD_FRAMEWORKS=TRUE \
284+
-DCMAKE_VERBOSE_MAKEFILE=ON
285+
cmake --build SFML-build --config Release --target install
286+
287+
- name: Build CSFML
288+
run: |
289+
cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
290+
-DCMAKE_C_COMPILER="/usr/bin/clang" \
291+
-DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
292+
-DCMAKE_C_FLAGS="-stdlib=libc++" \
293+
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
294+
-DBUILD_SHARED_LIBS=TRUE \
295+
-DCSFML_LINK_SFML_STATICALLY=FALSE \
296+
-DCMAKE_BUILD_TYPE=Release \
297+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
298+
-DCMAKE_OSX_ARCHITECTURES=arm64 \
299+
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
300+
-DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
301+
-DCMAKE_VERBOSE_MAKEFILE=ON
302+
cmake --build CSFML-build --config Release --target install
303+
304+
- name: Create Archive
305+
run: |
306+
mkdir CSFML-macOS-clang-arm64
307+
cp -R CSFML-install/include CSFML-macOS-clang-arm64
308+
cp -R CSFML-install/lib CSFML-macOS-clang-arm64
309+
cp CSFML-install/share/CSFML/* CSFML-macOS-clang-arm64
310+
tar -zcvf CSFML-macOS-clang-arm64.tar.gz CSFML-macOS-clang-arm64
311+
312+
- name: Upload Artifact
313+
uses: actions/upload-artifact@v4
314+
with:
315+
name: CSFML-macOS-clang-arm64
316+
path: CSFML-macOS-clang-arm64.tar.gz

‎doc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ add_custom_target(doc ALL
3838
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
3939
DESTINATION ${INSTALL_MISC_DIR}/doc
4040
COMPONENT doc)
41-
if(DOXYGEN_HHC_PROGRAM)
42-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CSFML.chm
41+
if(DOXYGEN_GENERATE_HTMLHELP)
42+
install(FILES ${DOXYGEN_OUTPUT_DIR}/CSFML.chm
4343
DESTINATION ${INSTALL_MISC_DIR}/doc
4444
COMPONENT doc)
4545
endif()

‎tools/BuildMacOS.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
VERSION="2.6.1"
4-
VERSION_C="2.6.0"
3+
VERSION="3.0.0"
4+
VERSION_C="3.0.0"
55
# BUILD_CSFML=FALSE
66
BUILD_CSFML=TRUE
77
BUILD_SFML=FALSE

‎tools/nuget/build.macos.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fixrpath()
167167
install_name_tool -change $OLD $NEW "$SFMLLibDir/libsfml-$MODULE.$SFMLMajorMinorPatch.dylib"
168168
}
169169

170-
fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisen"
170+
fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisenc"
171171
fixrpath audio "@rpath/../Frameworks/vorbisfile.framework/Versions/A/vorbisfile" "@rpath/vorbisfile.framework/Versions/A/vorbisfile"
172172
fixrpath audio "@rpath/../Frameworks/vorbis.framework/Versions/A/vorbis" "@rpath/vorbis.framework/Versions/A/vorbis"
173173
fixrpath audio "@rpath/../Frameworks/ogg.framework/Versions/A/ogg" "@rpath/ogg.framework/Versions/A/ogg"

0 commit comments

Comments
 (0)