From 223b6c74f5534fa64b2b0f7d638619c5cb7a0342 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 27 Oct 2019 23:16:24 -0400 Subject: fix windows build --- frontends/sdl/meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'frontends/sdl') diff --git a/frontends/sdl/meson.build b/frontends/sdl/meson.build index c7f67f3..10ce2d0 100644 --- a/frontends/sdl/meson.build +++ b/frontends/sdl/meson.build @@ -3,26 +3,28 @@ src = ['sdl_ui.c'] inc = [cetris_inc] threads = dependency('threads') -math = compiler.find_library('m') +deps = [] + if host_machine.system() == 'windows' - sdl = compiler.find_library('SDL2', dirs: meson.current_source_dir() + '/win/SDL2-2.0.10/lib/x64') - ttf = compiler.find_library('SDL2_ttf', dirs: meson.current_source_dir() + '/win/SDL2_ttf-2.0.15/lib/x64') + deps += compiler.find_library('SDL2', dirs: meson.current_source_dir() + '/win/SDL2-2.0.10/lib/x64') + deps += compiler.find_library('SDL2_ttf', dirs: meson.current_source_dir() + '/win/SDL2_ttf-2.0.15/lib/x64') inc += include_directories('win/SDL2-2.0.10/include') inc += include_directories('win/SDL2_ttf-2.0.15/include') else - sdl = dependency('SDl2') - ttf = dependency('SDL2_ttf') + deps += compiler.find_library('m') + deps += dependency('SDl2') + deps += dependency('SDL2_ttf') endif configure_file(input: 'config.ini', output: 'config.ini', copy: true, install: false) -configure_file(input: 'OpenSans-Regular.tff', +configure_file(input: 'OpenSans-Regular.ttf', output: 'OpenSans-Regular.ttf', copy: true, install: false) executable('cetris', src, - dependencies: [threads, sdl, ttf, math], + dependencies: deps, include_directories: inc, install: false) -- cgit v1.2.3-101-g0448