interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And got the Windows build working. Woo!

This commit is contained in:
Pietro Gagliardi 2019-03-24 12:57:25 -04:00
parent 2be9a4f3a3
commit c1dfc0ab5d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -24,8 +24,10 @@ project('libui', ['c', 'cpp'],
'b_pch=false', # we don't want precompiled headers 'b_pch=false', # we don't want precompiled headers
'b_staticpic=true', # use PIC even for static libraries 'b_staticpic=true', # use PIC even for static libraries
'c_std=c99', # strict C99 'c_std=c99', # strict C99
'c_winlibs=', # we define our own Windows libraries
'cpp_std=c++11', # strict C++11 'cpp_std=c++11', # strict C++11
'cpp_eh=sc', # shut the compiler up in some cases 'cpp_eh=sc', # shut the compiler up in some cases
'cpp_winlibs=', # likewise as with c_winlibs
], ],
license: 'MIT') license: 'MIT')
@ -44,12 +46,14 @@ libui_forced_options = {
'b_pch': 'false', # we don't want precompiled headers 'b_pch': 'false', # we don't want precompiled headers
'b_staticpic': 'true', # use PIC even for static libraries 'b_staticpic': 'true', # use PIC even for static libraries
'c_std': 'c99', # strict C99 'c_std': 'c99', # strict C99
'c_winlibs': '[]', # we define our own Windows libraries
'cpp_std': 'c++11', # strict C++11 'cpp_std': 'c++11', # strict C++11
'cpp_eh': 'sc', # shut the compiler up in some cases 'cpp_eh': 'sc', # shut the compiler up in some cases
'cpp_winlibs': '[]', # likewise as with c_winlibs
} }
foreach name, value : libui_forced_options foreach name, value : libui_forced_options
# TODO why does meson need this guard? # TODO why does meson need this guard? why aren't all options defined regardless of target?!
if name != 'cpp_eh' or libui_MSVC if not (name == 'cpp_eh' and not libui_MSVC) and not (name == 'c_std' and libui_MSVC)
actual = '@0@'.format(get_option(name)) actual = '@0@'.format(get_option(name))
if actual != value if actual != value
error('sorry, but libui requires that option ' + name + ' has the default value ' + value) error('sorry, but libui requires that option ' + name + ' has the default value ' + value)

20
windows/meson.build
View File

@ -1,5 +1,7 @@
# 23 march 2019 # 23 march 2019
windows = import('windows')
libui_sources += [ libui_sources += [
'windows/alloc.cpp', 'windows/alloc.cpp',
'windows/area.cpp', 'windows/area.cpp',
@ -63,24 +65,30 @@ libui_sources += [
'windows/winpublic.cpp', 'windows/winpublic.cpp',
'windows/winutil.cpp', 'windows/winutil.cpp',
] ]
libui_include_directories += [include_directories('.')]
# resources.rc only contains the libui manifest. # resources.rc only contains the libui manifest.
# For a DLL, we have to include this directly, so we do so. # For a DLL, we have to include this directly, so we do so.
# Windows won't link resources in static libraries, so including this would have no effect. # Windows won't link resources in static libraries, so including this would have no effect.
# In those cases, we just need them to include the manifest with the executable (or link it directly into the output executable themselves); they can also customize the manifest as they see fit (assuming nothing breaks in the process). # In those cases, we just need them to include the manifest with the executable (or link it directly into the output executable themselves); they can also customize the manifest as they see fit (assuming nothing breaks in the process).
# TODO make sure this gets added to both binary-only archives and install rules in this case # TODO make sure this gets added to both binary-only archives and install rules in this case
if libui_mode == 'shared' if libui_mode == 'shared'
libui_sources += ['windows/resources.rc'] libui_sources += [
# TODO settle the path thing once and for all
windows.compile_resources('resources.rc',
depend_files: ['libui.manifest'],
include_directories: libui_include_directories),
]
endif endif
libui_include_directories += [include_directories('.')]
libui_winlibs = 'user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid windowscodecs'.split(' ') libui_winlibs = 'user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid windowscodecs'.split(' ')
for lib in libui_winlibs foreach lib : libui_winlibs
libui_dep += [ libui_deps += [
meson.get_compiler('cpp').find_library(lib, meson.get_compiler('cpp').find_library(lib,
required: true), required: true),
] ]
endfor endforeach
if libui_OS == 'windows' and libui_mode == 'shared' and not libui_MSVC if libui_OS == 'windows' and libui_mode == 'shared' and not libui_MSVC
error('Sorry, but libui for Windows can currently only be built as a static library with MinGW. You will need to either build as a static library or switch to MSVC.') error('Sorry, but libui for Windows can currently only be built as a static library with MinGW. You will need to either build as a static library or switch to MSVC.')