Skip to content

Commit 739bbd5

Browse files
authored
Merge pull request #16 from pedrolcl/avoid-hardcoding-configuration-version
2 parents d1bcc22 + c129e6b commit 739bbd5

4 files changed

Lines changed: 16 additions & 4 deletions

File tree

.github/workflows/win-msvc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
5454
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}}
5555
-DCPACK_SYSTEM_NAME=${{matrix.arch}}
56+
-DINSTALL_DEPENDENCIES=ON
57+
id: configuration
5658

5759
- name: '${{ matrix.icon }} Build'
5860
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
@@ -79,6 +81,6 @@ jobs:
7981
uses: actions/upload-artifact@v6
8082
with:
8183
name: SonivoxV4-msvc-installer-${{matrix.arch}}
82-
path: ${{github.workspace}}/build/sonivox-4.0.0-${{matrix.arch}}.exe
84+
path: ${{github.workspace}}/build/sonivox-${{steps.configuration.outputs.config_version}}-${{matrix.arch}}.exe
8385
retention-days: 90
8486
overwrite: true

.github/workflows/win-msys2.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_LOCATION}}
7272
-DDEPENDENCY_DIRS=${{steps.msys2.outputs.msys2-location}}/${{matrix.sys}}/bin
7373
-DCPACK_SYSTEM_NAME=${{matrix.sys}}
74+
-DINSTALL_DEPENDENCIES=ON
75+
id: configuration
7476

7577
- name: '${{ matrix.icon }} Build'
7678
run: cmake --build build --config ${{env.BUILD_TYPE}}
@@ -100,6 +102,6 @@ jobs:
100102
uses: actions/upload-artifact@v6
101103
with:
102104
name: SonivoxV4-msys2-installer-${{matrix.sys}}
103-
path: ${{github.workspace}}/build/sonivox-4.0.0-${{matrix.sys}}.exe
105+
path: ${{github.workspace}}/build/sonivox-${{steps.configuration.outputs.config_version}}-${{matrix.sys}}.exe
104106
retention-days: 90
105107
overwrite: true

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ if (SF2_SUPPORT)
9292
set(_FLOAT_DCF ON)
9393
endif()
9494

95+
if (DEFINED ENV{GITHUB_OUTPUT})
96+
file(APPEND
97+
"$ENV{GITHUB_OUTPUT}"
98+
"config_version=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\n"
99+
)
100+
endif()
101+
95102
include(GNUInstallDirs)
96103

97104
# set(PROJECT_RELEASE_DATE "December 30, 2025")

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ The build system has the following options:
4040
* `SF2_SUPPORT`: Enable SF2 support and float DCF. ON by default.
4141
* `ZLIB_SUPPORT`: Enable XMF ZLIB Unpacker support. ON by default.
4242
* `BUILD_MANPAGE`: Build the manpage of the CLI program. OFF by default.
43+
* `INSTALL_DEPENDENCIES`: Deploy dependency libraries. OFF by default.
4344

4445
The synthesizer types options (at least one must be enabled):
4546

4647
* `EAS_WT_SYNTH`: Enable WaveTable Synth. ON by default.
47-
* `EAS_FM_SYNTH`: Enable FM Synth. OFF by default.
48+
* `EAS_FM_SYNTH`: Enable FM Synth. ON by default.
4849
* `EAS_HYBRID_SYNTH`: Enable Hybrid Synth. OFF by default. Requires both `USE_44KHZ` and `USE_16BITS_SAMPLES` to be OFF.
4950

5051
* `MAX_VOICES`: Maximum number of voices. 64 by default.
@@ -133,7 +134,7 @@ Example 8: pipe the rendered audio thru the ['mpv' media player](https://mpv.io/
133134

134135
Besides being multiplatform, this supports progress view and better navigation (backed by in-memory cache).
135136

136-
You may replace "ants.mid" by another MIDI or XMF file, like "test/res/testmxmf.mxmf"
137+
You may replace [ants.mid](https://github.com/EmbeddedSynth/sonivox/blob/devel/test/res/ants.mid) by another MIDI or XMF file, like [testmxmf.mxmf](https://github.com/EmbeddedSynth/sonivox/blob/devel/test/res/testmxmf.mxmf)
137138

138139
## Unit tests
139140

0 commit comments

Comments
 (0)