From 9f4b6507b102ea00f0be47525a4c59ff7e595f6c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 8 Apr 2019 23:39:27 -0400 Subject: [PATCH] Changed everything to use uiStatic instead of _UI_STATIC. --- examples/resources.rc | 2 +- meson.build | 4 ++-- zOLD_test/resources.rc | 2 +- zOLD_windows/_rc2bin/resources.rc | 2 +- zOLD_windows/_rc2bin/winapi.hpp | 2 +- zOLD_windows/resources.rc | 2 +- zOLD_windows/winapi.hpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/resources.rc b/examples/resources.rc index 49f486c1..31e48542 100644 --- a/examples/resources.rc +++ b/examples/resources.rc @@ -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" diff --git a/meson.build b/meson.build index 21e99f37..66370e4c 100644 --- a/meson.build +++ b/meson.build @@ -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, diff --git a/zOLD_test/resources.rc b/zOLD_test/resources.rc index ebc5d6e6..9ffb4290 100644 --- a/zOLD_test/resources.rc +++ b/zOLD_test/resources.rc @@ -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" diff --git a/zOLD_windows/_rc2bin/resources.rc b/zOLD_windows/_rc2bin/resources.rc index 989dfc91..783016cc 100644 --- a/zOLD_windows/_rc2bin/resources.rc +++ b/zOLD_windows/_rc2bin/resources.rc @@ -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 diff --git a/zOLD_windows/_rc2bin/winapi.hpp b/zOLD_windows/_rc2bin/winapi.hpp index 4f24f607..b5142318 100644 --- a/zOLD_windows/_rc2bin/winapi.hpp +++ b/zOLD_windows/_rc2bin/winapi.hpp @@ -9,7 +9,7 @@ #define INITGUID // for the manifest -#ifndef _UI_STATIC +#ifndef uiStatic #define ISOLATION_AWARE_ENABLED 1 #endif diff --git a/zOLD_windows/resources.rc b/zOLD_windows/resources.rc index 2ce7ee53..5c05f983 100644 --- a/zOLD_windows/resources.rc +++ b/zOLD_windows/resources.rc @@ -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 diff --git a/zOLD_windows/winapi.hpp b/zOLD_windows/winapi.hpp index 92c08230..94502f80 100644 --- a/zOLD_windows/winapi.hpp +++ b/zOLD_windows/winapi.hpp @@ -9,7 +9,7 @@ #define INITGUID // for the manifest -#ifndef _UI_STATIC +#ifndef uiStatic #define ISOLATION_AWARE_ENABLED 1 #endif