Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ jobs:
cp $(<$GITHUB_WORKSPACE/deps-macos.txt) $GITHUB_WORKSPACE/deps/arm64/release
chmod 644 $GITHUB_WORKSPACE/deps/arm64/release/*

echo "*** libfluidsynth transitive deps:"
otool -L libfluidsynth.3.dylib

echo "*** libslirp transitive deps:"
otool -L libslirp.dylib

Expand Down Expand Up @@ -167,9 +164,6 @@ jobs:
cp $(<$GITHUB_WORKSPACE/deps-linux.txt) $GITHUB_WORKSPACE/deps/release
chmod 644 $GITHUB_WORKSPACE/deps/release/*

echo "*** libfluidsynth transitive deps:"
ldd libfluidsynth.so.3

echo "*** libslirp transitive deps:"
ldd libslirp.so

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ This repository contains various external dependencies (typically dynamic
libraries) required by [DOSBox Staging](https://github.com/dosbox-staging/dosbox-staging).

Certain dependencies can take a very long time to compile on Windows. For
example, FluidSynth and Slirp usually take 20-30 minutes to compile from
scratch due to their dependence on `glib` which requires vcpkg to build an
example, Slirp usually takes 20-30 minutes to compile from
scratch due to its dependency on `glib` which requires vcpkg to build an
entire MSYS2 toolchain first. The situation is better on macOS and Linux, but
compiling these two from scratch still takes about 5-7 minutes. The solution
is to build these rarely changing artifacts outside the DOSBox Staging CI
Expand Down Expand Up @@ -42,7 +42,7 @@ library on each platform:
### Windows

```
dumpbin /dependents fluidsynth-3.dll
dumpbin /dependents slirp-0.dll
```

Note `dumpbin` does *not* perform a recursive lookup; you'll need to traverse
Expand All @@ -59,13 +59,13 @@ c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.43.3480
This will list all transitive dynamic dependencies recursively:

```
otool -L libfluidsynth.3.dylib
otool -L libslirp.dylib
```

### Linux

This will list all transitive dynamic dependencies recursively:

```
ldd libfluidsynth.so.3
ldd libslirp.so
```
2 changes: 1 addition & 1 deletion deps-linux.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libfluidsynth.so.3 libslirp.so libglib-2.0.so.0 libpcre2-8.so.0
libslirp.so libglib-2.0.so.0 libpcre2-8.so.0
2 changes: 1 addition & 1 deletion deps-macos.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libfluidsynth.3.dylib libslirp.dylib libglib-2.0.0.dylib libgthread-2.0.0.dylib libintl.8.dylib libpcre2-8.0.14.0.dylib
libslirp.dylib libglib-2.0.0.dylib libgthread-2.0.0.dylib libintl.8.dylib libpcre2-8.0.14.0.dylib
2 changes: 1 addition & 1 deletion deps-windows-debug.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libfluidsynth-3.dll slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8d.dll
slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8d.dll
2 changes: 1 addition & 1 deletion deps-windows-release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libfluidsynth-3.dll slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8.dll
slirp-0.dll glib-2.0-0.dll iconv-2.dll intl-8.dll pcre2-8.dll
51 changes: 0 additions & 51 deletions vcpkg-ports/fluidsynth/gentables.patch

This file was deleted.

12 changes: 0 additions & 12 deletions vcpkg-ports/fluidsynth/pkgconfig-opensles.diff

This file was deleted.

81 changes: 0 additions & 81 deletions vcpkg-ports/fluidsynth/portfile.cmake

This file was deleted.

10 changes: 0 additions & 10 deletions vcpkg-ports/fluidsynth/usage

This file was deleted.

51 changes: 0 additions & 51 deletions vcpkg-ports/fluidsynth/vcpkg.json

This file was deleted.

1 change: 0 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"description": "DOSBox Staging external dependencies.",
"version": "0.83.0-alpha",
"dependencies": [
"fluidsynth",
"libslirp"
],
"builtin-baseline": "52572867982f5265a7c71f59be1a006dfc49c90c"
Expand Down