Skip to content

Commit 7d7dd8f

Browse files
apple1417apple1417
authored
Merge pull request #6 from apple1417/master
fix 32-bit dsound using wrong calling convention
2 parents f12de3c + b53615b commit 7d7dd8f

File tree

16 files changed

+195
-95
lines changed

16 files changed

+195
-95
lines changed

‎.clang-tidy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,6 @@ CheckOptions:
5151
readability-identifier-naming.NamespaceCase: lower_case
5252
readability-identifier-naming.ParameterCase: lower_case
5353
readability-identifier-naming.VariableCase: lower_case
54+
55+
readability-identifier-length.IgnoredVariableNames: _
5456
---

‎.cruft.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "[email protected]:bl-sdk/common_dotfiles.git",
3-
"commit": "fb06ff8c773806b3f8cc69dbda60c0a7b481c6de",
3+
"commit": "597ec422d3b5692927f325b9b5c2ae42288e8cc5",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

‎.devcontainer/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ignore any custom folders outside of our predefined ones, to let you create your own
2+
# One use might be using your own container mapping the install path onto your actual game folder
3+
*/
4+
!clang-cross
5+
!llvm-mingw
6+
!mingw

‎.devcontainer/Dockerfile‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
FROM alpine:latest AS clang-cross
2+
CMD ["/bin/bash"]
3+
RUN <<EOF
4+
apk add --no-cache \
5+
bash \
6+
clang \
7+
clang-extra-tools \
8+
cmake \
9+
git \
10+
lld \
11+
llvm \
12+
msitools \
13+
ninja \
14+
openssh \
15+
perl \
16+
python3 \
17+
py3-requests
18+
git clone https://github.com/mstorsjo/msvc-wine.git
19+
msvc-wine/vsdownload.py \
20+
--accept-license \
21+
--dest /win-sdk \
22+
Microsoft.VisualStudio.Workload.VCTools \
23+
--arch x86 x64
24+
msvc-wine/install.sh /win-sdk
25+
rm -r msvc-wine
26+
EOF
27+
28+
# llvm-mingw comes with pre-built ubuntu binaries, so using that
29+
FROM ubuntu:latest AS llvm-mingw
30+
CMD ["/bin/bash"]
31+
RUN <<EOF
32+
apt-get update
33+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \
34+
apt-get install -y \
35+
cmake \
36+
git \
37+
msitools \
38+
ninja-build \
39+
python-is-python3 \
40+
python3 \
41+
python3-requests \
42+
wget \
43+
xz-utils
44+
wget -nv https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
45+
tar -xf llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
46+
rm llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64.tar.xz
47+
mv llvm-mingw-20250114-msvcrt-ubuntu-20.04-x86_64 /llvm-mingw
48+
EOF
49+
ENV PATH="/llvm-mingw/bin:$PATH"
50+
51+
FROM alpine:latest AS mingw
52+
CMD ["/bin/bash"]
53+
RUN <<EOF
54+
apk add --no-cache \
55+
bash \
56+
cmake \
57+
git \
58+
i686-mingw-w64-gcc \
59+
mingw-w64-gcc \
60+
msitools \
61+
ninja \
62+
openssh \
63+
py3-requests \
64+
python3
65+
EOF

‎.devcontainer/clang-cross/devcontainer.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "clang-cross",
3+
"build": {
4+
"dockerfile": "../Dockerfile",
5+
"target": "clang-cross"
6+
}
7+
}

‎.devcontainer/llvm-mingw/devcontainer.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "llvm-mingw",
3+
"build": {
4+
"dockerfile": "../Dockerfile",
5+
"target": "llvm-mingw"
6+
}
7+
}

‎.devcontainer/mingw/devcontainer.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "mingw",
3+
"build": {
4+
"dockerfile": "../Dockerfile",
5+
"target": "mingw"
6+
}
7+
}

‎.github/workflows/build.yml‎

Lines changed: 36 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
type: string
1212
required: false
1313

14-
env:
15-
LLVM_MINGW_VERSION: llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64
16-
LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64.tar.xz
17-
1814
jobs:
1915
build-windows:
2016
runs-on: windows-latest
@@ -62,87 +58,60 @@ jobs:
6258
name: ${{ matrix.preset }}
6359
path: out/install/${{ matrix.preset }}/
6460

61+
6562
build-ubuntu:
66-
runs-on: ubuntu-24.04
63+
runs-on: ubuntu-latest
6764

6865
strategy:
6966
fail-fast: false
7067
matrix:
71-
preset: [
72-
"clang-cross-x86-release",
73-
"clang-cross-x64-release",
74-
"llvm-mingw-x86-release",
75-
"llvm-mingw-x64-release",
76-
"mingw-x86-release",
77-
"mingw-x64-release",
78-
]
68+
toolchain:
69+
- preset: clang-cross-x86-release
70+
container: clang-cross
71+
- preset: clang-cross-x64-release
72+
container: clang-cross
73+
- preset: llvm-mingw-x86-release
74+
container: llvm-mingw
75+
- preset: llvm-mingw-x64-release
76+
container: llvm-mingw
77+
- preset: mingw-x86-release
78+
container: mingw
79+
- preset: mingw-x64-release
80+
container: mingw
7981

8082
steps:
81-
- name: Setup CMake and Ninja
82-
uses: lukka/get-cmake@latest
83-
84-
- name: Setup apt packages
85-
uses: awalsh128/cache-apt-pkgs-action@latest
86-
with:
87-
packages: msitools
88-
version: ${{ runner.os }}-apt
89-
90-
- name: Setup LLVM MinGW
91-
if: startswith(matrix.preset, 'llvm-mingw')
92-
run: |
93-
wget -nv ${{ env.LLVM_MINGW_DOWNLOAD }}
94-
tar -xf ${{ env.LLVM_MINGW_VERSION }}.tar.xz -C ~/
95-
echo $(readlink -f ~/${{ env.LLVM_MINGW_VERSION }}/bin) >> $GITHUB_PATH
96-
97-
- name: Setup MinGW
98-
if: startswith(matrix.preset, 'mingw')
99-
uses: egor-tensin/setup-mingw@v2
100-
with:
101-
platform: ${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'x64')] }}
102-
103-
- name: Setup Clang
104-
if: startswith(matrix.preset, 'clang-cross')
105-
uses: egor-tensin/setup-clang@v1
106-
107-
- name: Restore win sdk cache
108-
if: startswith(matrix.preset, 'clang-cross')
109-
uses: actions/cache@v4
110-
id: cache-win-sdk
111-
with:
112-
path: ~/win-sdk
113-
key: ${{ runner.os }}-win-sdk
114-
115-
- name: Setup win sdk
116-
if: startswith(matrix.preset, 'clang-cross') && steps.cache-win-sdk.outputs.cache-hit != 'true'
117-
run: |
118-
git clone https://github.com/mstorsjo/msvc-wine.git
119-
msvc-wine/vsdownload.py --accept-license --dest ~/win-sdk Microsoft.VisualStudio.Workload.VCTools
120-
msvc-wine/install.sh ~/win-sdk
121-
rm -r msvc-wine
122-
12383
- name: Checkout repository and submodules
12484
uses: actions/checkout@v4
12585
with:
12686
submodules: recursive
12787

128-
- name: Configure CMake
129-
working-directory: ${{ env.GITHUB_WORKSPACE }}
130-
# The extra msvc wine arg won't do anything if we're not cross compiling
131-
run: >
132-
cmake .
133-
--preset ${{ matrix.preset }}
134-
-G Ninja
135-
-DMSVC_WINE_ENV_SCRIPT=$(readlink -f ~)/win-sdk/bin/${{ fromJSON('["x86", "x64"]')[contains(matrix.preset, 'x64')] }}/msvcenv.sh
88+
- name: Login to GitHub Container Registry
89+
uses: docker/login-action@v2
90+
with:
91+
registry: ghcr.io
92+
username: ${{ github.repository_owner }}
93+
password: ${{ secrets.GITHUB_TOKEN }}
13694

13795
- name: Build
138-
working-directory: ${{ env.GITHUB_WORKSPACE }}
139-
run: cmake --build out/build/${{ matrix.preset }} --target install
96+
uses: devcontainers/[email protected]
97+
with:
98+
cacheFrom: ghcr.io/bl-sdk/${{ matrix.toolchain.container }}:latest
99+
configFile: .devcontainer/${{ matrix.toolchain.container }}/devcontainer.json
100+
push: never
101+
# The git watcher cmake thinks something's unsafe? Doesn't happen to me locally.
102+
runCmd: |
103+
git config --global --add safe.directory `pwd`
104+
105+
set -e
106+
107+
cmake . --preset ${{ matrix.toolchain.preset }} -G Ninja
108+
cmake --build out/build/${{ matrix.toolchain.preset }} --target install
140109
141110
- name: Upload artifact
142111
uses: actions/upload-artifact@v4
143112
with:
144-
name: ${{ matrix.preset }}
145-
path: out/install/${{ matrix.preset }}/
113+
name: ${{ matrix.toolchain.preset }}
114+
path: out/install/${{ matrix.toolchain.preset }}/
146115

147116
# ==============================================================================
148117

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
.vs
22
.vscode
3+
.idea
34

45
# C/C++ excludes
56
.cache/clangd
67
.gdbinit
78
out
89

9-
# User scripts with templates
10-
postbuild
11-
postbuild.bat
12-
1310
# CMake (from https://github.com/github/gitignore/blob/main/CMake.gitignore)
1411
CMakeLists.txt.user
1512
CMakeCache.txt

‎.typos.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,14 @@ extend-exclude = [
77
".typos.toml"
88
]
99

10+
[default]
11+
extend-ignore-re = [
12+
# Ignore markdown links to github commits/trees
13+
"\\[[0-9a-fA-F]+?\\]\\(https://github.com/.+?/.+?/(commit|tree)/.+?\\)",
14+
]
15+
16+
[default.extend-identifiers]
17+
llibgcc_s_seh = "llibgcc_s_seh"
18+
1019
[default.extend-words]
1120
UE = "UE"

0 commit comments

Comments
 (0)