asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Windows: Fix GCC -fpermissive error with 'pck' section workaround

Browse source 
Follow-up to #57450.

(cherry picked from commit 5a1f42b322)
This commit is contained in:
Rémi Verschelde 2022-02-01 11:33:32 +01:00
parent b7b2fd0634
commit 58edf04240
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show stats 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 #ifndef TOOLS_ENABLED
#if defined _MSC_VER #if defined _MSC_VER
#pragma section("pck", read) #pragma section("pck", read)
__declspec(allocate("pck")) static char dummy[8] = { 0 }; __declspec(allocate("pck")) static const char dummy[8] = { 0 };
#elif defined __GNUC__ #elif defined __GNUC__
static const char dummy[8] __attribute__((section("pck"), used)) = { 0 }; static const char dummy[8] __attribute__((section("pck"), used)) = { 0 };
#endif #endif
@ -142,7 +142,7 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
#ifndef TOOLS_ENABLED #ifndef TOOLS_ENABLED
// Workaround to prevent LTCG (MSVC LTO) from removing "pck" section // Workaround to prevent LTCG (MSVC LTO) from removing "pck" section
char *dummy_guard = dummy; const char *dummy_guard = dummy;
#endif #endif
char **argv_utf8 = new char *[argc]; char **argv_utf8 = new char *[argc];