Split the shared and static resources on the Windows tester, for the same reason.

This commit is contained in:
Pietro Gagliardi 2019-06-01 10:29:48 -04:00
parent a8cd121003
commit f2ce4c8f56
6 changed files with 19 additions and 19 deletions

View File

@ -8,14 +8,10 @@ libui_test_sources = [
]
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',
windows.compile_resources('resources_' + libui_mode + '.rc',
args: libui_manifest_args,
depend_files: [libui_test_manifest]),
depend_files: ['test_' + libui_mode + '.manifest']),
]
endif

View File

@ -1,13 +0,0 @@
// 30 may 2015
// this is a UTF-8 file
#pragma code_page(65001)
// this is the Common Controls 6 manifest
// 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
// we also don't define Common Controls v6 in the shared manifest to ensure that the isolation awareness actually does work
#ifndef uiStatic
1 24 "test.manifest"
#else
1 24 "test.static.manifest"
#endif

9
test/resources_shared.rc Normal file
View File

@ -0,0 +1,9 @@
// 30 may 2015
// This is a UTF-8 file.
#pragma code_page(65001)
// This is the Common Controls 6 manifest.
// 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.
// We also don't define Common Controls v6 in the test program's shared manifest to ensure that the isolation awareness actually does work.
1 24 "test_shared.manifest"

8
test/resources_static.rc Normal file
View File

@ -0,0 +1,8 @@
// 30 may 2015
// This is a UTF-8 file.
#pragma code_page(65001)
// This is the Common Controls 6 manifest.
// 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.
1 24 "test_static.manifest"