Changed everything to use uiStatic instead of _UI_STATIC.
This commit is contained in:
parent
c5db824918
commit
9f4b6507b1
|
@ -6,7 +6,7 @@
|
|||
// 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 _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
1 24 "example.manifest"
|
||||
#else
|
||||
1 24 "example.static.manifest"
|
||||
|
|
|
@ -109,8 +109,8 @@ endif
|
|||
# TODO (after the above TODO is resolved) move that below the part below that actually adds these arguments
|
||||
libui_manifest_args = []
|
||||
if libui_mode == 'static'
|
||||
libui_project_compile_args += ['-D_UI_STATIC']
|
||||
libui_manifest_args = ['-D_UI_STATIC']
|
||||
libui_project_compile_args += ['-DuiStatic']
|
||||
libui_manifest_args = ['-DuiStatic']
|
||||
endif
|
||||
|
||||
add_project_arguments(libui_project_compile_args,
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
// 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 _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
1 24 "test.manifest"
|
||||
#else
|
||||
1 24 "test.static.manifest"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
// this is the Common Controls 6 manifest
|
||||
// we only define it in a shared build; static builds have to include the appropriate parts of the manifest in the output executable
|
||||
// LONGTERM set up the string values here
|
||||
#ifndef _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libui.manifest"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#define INITGUID
|
||||
|
||||
// for the manifest
|
||||
#ifndef _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
#define ISOLATION_AWARE_ENABLED 1
|
||||
#endif
|
||||
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
// this is the Common Controls 6 manifest
|
||||
// we only define it in a shared build; static builds have to include the appropriate parts of the manifest in the output executable
|
||||
// LONGTERM set up the string values here
|
||||
#ifndef _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libui.manifest"
|
||||
#endif
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#define INITGUID
|
||||
|
||||
// for the manifest
|
||||
#ifndef _UI_STATIC
|
||||
#ifndef uiStatic
|
||||
#define ISOLATION_AWARE_ENABLED 1
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue