Possible fix for meson 1.10 and/or Mac builds.
This commit is contained in:
parent
66e2328ea8
commit
2b69f388e5
2 changed files with 1 additions and 13 deletions
12
meson.build
12
meson.build
|
|
@ -22,14 +22,6 @@ cc = meson.get_compiler('cpp')
|
||||||
dependencies = []
|
dependencies = []
|
||||||
|
|
||||||
if build_machine.system() == 'windows'
|
if build_machine.system() == 'windows'
|
||||||
add_global_link_arguments(
|
|
||||||
'-static-libgcc',
|
|
||||||
'-static-libstdc++',
|
|
||||||
'-static',
|
|
||||||
'-flto',
|
|
||||||
language: 'cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
sfml_main = subproject('sfml').get_variable('sfml_main_dep')
|
sfml_main = subproject('sfml').get_variable('sfml_main_dep')
|
||||||
opengl32 = cc.find_library('opengl32', required: true)
|
opengl32 = cc.find_library('opengl32', required: true)
|
||||||
winmm = cc.find_library('winmm', required: true)
|
winmm = cc.find_library('winmm', required: true)
|
||||||
|
|
@ -41,10 +33,6 @@ if build_machine.system() == 'windows'
|
||||||
exe_defaults += ['werror=true']
|
exe_defaults += ['werror=true']
|
||||||
|
|
||||||
elif build_machine.system() == 'darwin'
|
elif build_machine.system() == 'darwin'
|
||||||
add_global_link_arguments(
|
|
||||||
language: 'cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
opengl = dependency('OpenGL')
|
opengl = dependency('OpenGL')
|
||||||
corefoundation = dependency('CoreFoundation')
|
corefoundation = dependency('CoreFoundation')
|
||||||
carbon = dependency('Carbon')
|
carbon = dependency('Carbon')
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[wrap-git]
|
[wrap-git]
|
||||||
directory=lel-guecs-0.7.0
|
directory=lel-guecs-0.7.1
|
||||||
url=https://git.zedshaw.games/games/lel-guecs.git
|
url=https://git.zedshaw.games/games/lel-guecs.git
|
||||||
revision=HEAD
|
revision=HEAD
|
||||||
depth=1
|
depth=1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue