From d7a3802571ab1e0286b74cf28421a12d7f87f11d Mon Sep 17 00:00:00 2001 From: u130b8 <115743848+u130b8@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:11:47 +0300 Subject: [PATCH] use custom defines to prevent vs builds from breaking --- build.cmd | 4 ++-- progmgr/progmgr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.cmd b/build.cmd index 578afa9..112dbe7 100644 --- a/build.cmd +++ b/build.cmd @@ -12,10 +12,10 @@ set /P GIT_HASH=<%DIR_RELEASE%\.git_hash set "GIT_HASH=%GIT_HASH:~0,8%" if "%1" == "debug" ( - set CL=/MT /Od /Zi /RTC1 /Fdprogmgr.pdb /fsanitize=address /DUNICODE /DPROGMGR_GIT_HASH="%GIT_HASH%" + set CL=/MT /Od /Zi /RTC1 /Fdprogmgr.pdb /fsanitize=address /DUNICODE /DPROGMGR_DEBUG /DPROGMGR_GIT_HASH="%GIT_HASH%" set LINK=/DEBUG ) else ( - set CL=/O1 /GS- /DUNICODE /DNDEBUG /DPROGMGR_GIT_HASH="%GIT_HASH%" + set CL=/O1 /GS- /DUNICODE /DNDEBUG /DPROGMGR_RELEASE /DPROGMGR_GIT_HASH="%GIT_HASH%" set LINK=/NODEFAULTLIB /OPT:REF /OPT:ICF ) diff --git a/progmgr/progmgr.c b/progmgr/progmgr.c index 3eacc33..a503170 100644 --- a/progmgr/progmgr.c +++ b/progmgr/progmgr.c @@ -170,7 +170,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, // But in Debug builds, we need the C runtime, otherwise the address sanitizer and // MSVC debug tools break because they use the wWinMainCRTStartup entrypoint to initialize. -#ifdef NDEBUG +#ifdef PROGMGR_RELEASE #pragma function(memset) void *memset(char* dst, int value, size_t count) { while (count--) { *dst++ = value; }