backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-23 17:23:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: only link libshiggy if enable_shiggy is true
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details

Browse source
This commit is contained in:
Tropical 2026-03-15 01:02:42 -05:00
parent 649bc00fe4
commit 09ac8336a3
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Minecraft.Client/meson.build
View file

@ -45,15 +45,7 @@ if host_machine.system() == 'linux'
).stdout().strip().split('\n')
endif
shiggy_dep = dependency(
'shiggy',
fallback : ['shiggy', 'shiggy_dep'],
)
client = executable('Minecraft.Client',
client_sources + platform_sources + localisation[1],
include_directories : include_directories('Platform', 'Platform/Linux/Iggy/include'),
dependencies : [
client_dependencies = [
render_dep,
input_dep,
profile_dep,
@ -64,9 +56,27 @@ client = executable('Minecraft.Client',
glu_dep,
thread_dep,
thread_dep,
shiggy_dep,
dependency('zlib'),
],
]
if get_option('enable_vsync')
global_cpp_defs += '-DENABLE_VSYNC'
endif
if get_option('enable_shiggy')
shiggy_dep = dependency(
'shiggy',
fallback : ['shiggy', 'shiggy_dep'],
)
global_cpp_defs += '-D_ENABLEIGGY'
client_dependencies += shiggy_dep
endif
client = executable('Minecraft.Client',
client_sources + platform_sources + localisation[1],
include_directories : include_directories('Platform', 'Platform/Linux/Iggy/include'),
dependencies : client_dependencies,
cpp_args : global_cpp_args + global_cpp_defs + [
'-DUNICODE', '-D_UNICODE',
'-include', meson.current_source_dir() / 'Platform/stdafx.h',

8
meson.build
View file

@ -38,14 +38,6 @@ global_cpp_defs = [
'-DDEBUG',
]
if get_option('enable_vsync')
global_cpp_defs += '-DENABLE_VSYNC'
endif
if get_option('enable_iggy')
global_cpp_defs += '-D_ENABLEIGGY'
endif
if host_machine.system() == 'linux'
global_cpp_defs += [
'-Dlinux',