1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff --git a/meson.build b/meson.build
index f1964fc..2fb46c9 100644
--- a/meson.build
+++ b/meson.build
@@ -95,8 +95,6 @@ endif
# Various helper libraries, subprojects, and scripts common to all builds
fs = import('fs')
-tools = subproject('general-tools')
-padbin = tools.get_variable('padbin_executable')
bin2s = files('tools/bin2s.py')
call_bin2s = files('tools/callBin2S.py')
if host_machine.system() == 'horizon'
@@ -150,10 +148,10 @@ if host_machine.system() != 'gba'
vorbisfile = dependency('vorbisfile', static : true, default_options : ['default_library=static'], fallback : ['vorbis', 'vorbisfile_dep'])
else
# Other required dependencies
- openmpt = dependency('openmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
+ openmpt = dependency('libopenmpt', default_options : ['default_library=static'], fallback : ['openmpt', 'openmpt_dep'])
tilengine = dependency('Tilengine', default_options : ['default_library=static'], fallback : ['Tilengine', 'tilengine_dep'])
sdl2_dep = dependency('sdl2', default_options : ['default_library=static'], fallback : ['sdl2', 'sdl2_dep'])
- sdl_mixer = dependency('sdl2_mixer', default_options : ['default_library=static'], fallback : ['sdl2_mixer', 'sdl2_mixer_dep'])
+ sdl_mixer = dependency('SDL2_mixer', default_options : ['default_library=static'], fallback : ['sdl2_mixer', 'sdl2_mixer_dep'])
soloud = dependency('SoLoud', default_options : ['default_library=static'], fallback : ['SoLoud', 'soloud_dep'])
if host_machine.system() == 'linux'
vorbis = dependency('vorbis', default_options : ['default_library=static'], fallback : ['vorbis', 'vorbis_dep'])
|