Skip to content

Commit

Permalink
Merge branch 'cleaner-build-files' into 'main'
Browse files Browse the repository at this point in the history
Cleaner build files

See merge request tdt4102/vs-code/resources!16
  • Loading branch information
joakibhu committed Nov 2, 2025
2 parents cc36130 + e992495 commit d771c52
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions configuration/gui/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@ project('GUI Project', 'cpp',
'c_std=c17',
'default_library=static'])

# Windows compilation has no pre-packaged SDL2 available, and compilation takes a while.
# If you want to compile from source, remove everything but the contents of the else clause.
if host_machine.system() == 'windows'
sdl2_dep = subproject('sdl2_windows').get_variable('sdl2_windows_dep')
else
sdl2_dep = dependency('sdl2')
endif

animationwindow_dep = dependency('animationwindow', fallback: ['animationwindow', 'animationwindow_dep'])
std_lib_facilities_dep = dependency('std_lib_facilities', fallback: ['std_lib_facilities', 'std_lib_facilities_dep'])


if host_machine.system() == 'linux'
compiler_flags = ['-Wconversion', '-fdiagnostics-color=always', '-Werror=return-type']
else
Expand All @@ -25,4 +16,4 @@ endif

src = ['main.cpp']

exe = executable('program', src, dependencies : [animationwindow_dep, sdl2_dep, std_lib_facilities_dep], cpp_args : compiler_flags)
exe = executable('program', src, dependencies : [animationwindow_dep, std_lib_facilities_dep], cpp_args : compiler_flags)

0 comments on commit d771c52

Please sign in to comment.