Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #57509 from akien-mga/windows-pck-embed-fpermissive

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-01 12:19:53 +01:00 • committed by GitHub
commit 473f681651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/windows/godot_windows.cpp
View file

@ -39,7 +39,7 @@
#ifndef TOOLS_ENABLED
#if defined _MSC_VER
#pragma section("pck", read)
__declspec(allocate("pck")) static char dummy[8] = { 0 };
__declspec(allocate("pck")) static const char dummy[8] = { 0 };
#elif defined __GNUC__
static const char dummy[8] __attribute__((section("pck"), used)) = { 0 };
#endif
@ -142,7 +142,7 @@ int widechar_main(int argc, wchar_t **argv) {
#ifndef TOOLS_ENABLED
// Workaround to prevent LTCG (MSVC LTO) from removing "pck" section
char *dummy_guard = dummy;
const char *dummy_guard = dummy;
#endif
char **argv_utf8 = new char *[argc];