diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2019-10-11 05:35:07 +0000 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2019-10-11 05:35:07 +0000 |
| commit | a1488e40624a1e4b25842da89688c5cac7d6a865 (patch) | |
| tree | 9efa53a6c01d08bedde912734fceb64dc3ef4ee5 /finch/meson.build | |
| parent | fa70a700bd7f5e0d1d26936821cb4881b3cc7036 (diff) | |
| parent | d7390a970bb15430e1056366c99c0f3b75fc0584 (diff) | |
| download | pidgin-a1488e40624a1e4b25842da89688c5cac7d6a865.tar.gz | |
Merged in default (pull request #594)
Fix some Windows build issues
Approved-by: Gary Kramlich
Approved-by: Eion Robb
Diffstat (limited to 'finch/meson.build')
| -rw-r--r-- | finch/meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/finch/meson.build b/finch/meson.build index b21545b3d3..89147387d8 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -144,8 +144,7 @@ finch_SOURCES = [ ] if IS_WIN32 -# libfinch_la_LIBADD += \ -# -lwinmm + winmm = compiler.find_library('winmm') finch_winres = configure_file( input : 'finch_winres.rc.in', @@ -157,6 +156,8 @@ if IS_WIN32 output : 'libfinch_winres.rc', configuration : version_conf) libfinch_SOURCES += windows.compile_resources(libfinch_winres) +else + winmm = [] endif if enable_consoleui @@ -168,7 +169,7 @@ if enable_consoleui c_args : ['-DSTANDALONE', '-DGNTSEAL_ENABLE', ncurses_header], include_directories : [toplevel_inc], version : PURPLE_LIB_VERSION, - dependencies : [libpurple_dep, libgnt_dep, ncurses, glib], + dependencies : [libpurple_dep, libgnt_dep, ncurses, glib, winmm], install : true) libfinch_dep = declare_dependency( include_directories : [toplevel_inc, libfinch_inc], |