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

And fixed build errors. It works! Now to translate everything else back.

This commit is contained in:
Pietro Gagliardi 2019-06-15 20:06:12 -04:00
parent 83dc1d6065
commit 8c7f1987da
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -2,7 +2,7 @@
# TODO I'm not sure how to allow building 32-bit instead of 64-bit with meson # TODO I'm not sure how to allow building 32-bit instead of 64-bit with meson
# TODO remove cpp from this list once https://github.com/mesonbuild/meson/issues/5181 is settled; move it to the OS checks and under cpp-multithread # TODO remove cpp from this list once https://github.com/mesonbuild/meson/issues/5181 is settled; move it to the OS checks and under test and cpp-multithread
project('libui', ['c', 'cpp'], project('libui', ['c', 'cpp'],
meson_version: '>=0.48.0', meson_version: '>=0.48.0',
default_options: [ default_options: [

6
test/events_errors.cpp
View File

@ -106,7 +106,7 @@ static const struct checkErrorCase cases[] = {
checkWithGlobalEvent([](uiEvent *e) { checkWithGlobalEvent([](uiEvent *e) {
int handler; int handler;
handler = uiEventAddHandler(e, dummyHander, NULL, NULL); handler = uiEventAddHandler(e, dummyHandler, NULL, NULL);
uiEventFree(e); uiEventFree(e);
uiEventDeleteHandler(e, handler); uiEventDeleteHandler(e, handler);
}); });
@ -213,10 +213,10 @@ static const struct checkErrorCase cases[] = {
"uiEventFire() with a NULL sender on a non-global event", "uiEventFire() with a NULL sender on a non-global event",
[](void) { [](void) {
checkWithNonglobalEvent([](uiEvent *e) { checkWithNonglobalEvent([](uiEvent *e) {
uiEventFIre(e, NULL, NULL); uiEventFire(e, NULL, NULL);
}); });
}, },
"uiEventFire(): can't use a NULL sender with a non-global event") "uiEventFire(): can't use a NULL sender with a non-global event",
}, },
{ {

9
test/meson.build
View File

@ -16,7 +16,7 @@ if libui_OS == 'windows'
] ]
elif libui_OS == 'darwin' elif libui_OS == 'darwin'
libui_test_sources += [ libui_test_sources += [
'controls_darwin.m', # 'controls_darwin.m',
] ]
else else
libui_test_sources += [ libui_test_sources += [
@ -24,12 +24,17 @@ else
] ]
endif endif
libui_test_cpp_extra_args = []
if libui_OS == 'windows' if libui_OS == 'windows'
libui_test_sources += [ libui_test_sources += [
windows.compile_resources('resources_' + libui_mode + '.rc', windows.compile_resources('resources_' + libui_mode + '.rc',
args: libui_manifest_args, args: libui_manifest_args,
depend_files: ['test_' + libui_mode + '.manifest']), depend_files: ['test_' + libui_mode + '.manifest']),
] ]
elif libui_OS == 'darwin'
# since we use a deployment target of 10.8, the non-C++11-compliant libstdc++ is chosen by default; we need C++11
# see issue #302 for more details
libui_test_cpp_extra_args += ['--stdlib=libc++']
endif endif
libui_test_deps = [] libui_test_deps = []
@ -41,6 +46,8 @@ subdir('lib')
libui_tester = executable('tester', libui_test_sources, libui_tester = executable('tester', libui_test_sources,
dependencies: libui_binary_deps + libui_test_deps, dependencies: libui_binary_deps + libui_test_deps,
link_with: libui_libui, link_with: libui_libui,
cpp_args: libui_test_cpp_extra_args,
link_args: libui_test_cpp_extra_args,
gui_app: false, gui_app: false,
install: false) install: false)
test('test', libui_tester, test('test', libui_tester,

2
test/test.h
View File

@ -45,7 +45,7 @@ struct checkErrorCase {
void (*f)(void); void (*f)(void);
const char *msgWant; const char *msgWant;
}; };
extern void checkProgrammerErrorsFull(testingT *t, const char *file, long line, struct checkErrorCase *cases, bool inThread); extern void checkProgrammerErrorsFull(testingT *t, const char *file, long line, const struct checkErrorCase *cases, bool inThread);
#define checkProgrammerErrors(t, cases) checkProgrammerErrorsFull(t, __FILE__, __LINE__, cases, false) #define checkProgrammerErrors(t, cases) checkProgrammerErrorsFull(t, __FILE__, __LINE__, cases, false)
#define checkProgrammerErrorsInThread(t, cases) checkProgrammerErrorsFull(t, __FILE__, __LINE__, cases, true) #define checkProgrammerErrorsInThread(t, cases) checkProgrammerErrorsFull(t, __FILE__, __LINE__, cases, true)