ANd integrated the test manifest back into the tester.

This commit is contained in:
Pietro Gagliardi 2019-04-21 17:59:29 -04:00
parent f548f6d4d2
commit 63952a3e20
4 changed files with 11 additions and 12 deletions

View File

@ -6,17 +6,17 @@ libui_test_sources = [
'testing.c',
]
#if libui_OS == 'windows'
# libui_test_manifest = 'test.manifest'
# if libui_mode == 'static'
# libui_test_manifest = 'test.static.manifest'
# endif
# libui_test_sources += [
# windows.compile_resources('resources.rc',
# args: libui_manifest_args,
# depend_files: [libui_test_manifest]),
# ]
#endif
if libui_OS == 'windows'
libui_test_manifest = 'test.manifest'
if libui_mode == 'static'
libui_test_manifest = 'test.static.manifest'
endif
libui_test_sources += [
windows.compile_resources('resources.rc',
args: libui_manifest_args,
depend_files: [libui_test_manifest]),
]
endif
# TODO once we upgrade to 0.49.0, add pie: true
# TODO once we upgrade to 0.50.0, add protocol: 'exitcode'

View File

@ -4,7 +4,6 @@
#pragma code_page(65001)
// this is the Common Controls 6 manifest
// TODO set up the string values here
// 1 is the value of CREATEPROCESS_MANIFEST_RESOURCE_ID and 24 is the value of RT_MANIFEST; we use it directly to avoid needing to share winapi.h with the tests and examples
#ifndef uiStatic
1 24 "test.manifest"