Skip to content

Commit

Permalink
- Commit changes that Discord compilation always makes on Linux, lead…
Browse files Browse the repository at this point in the history
…ing to -m on compiles.
  • Loading branch information
mjr4077au committed Jul 20, 2022
1 parent 6c915d7 commit 6b4561f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions libraries/discordrpc/src/discord_register_linux.cpp
Expand Up @@ -42,12 +42,12 @@ extern "C" DISCORD_EXPORT void Discord_Register(const char* applicationId, const
}

const char* desktopFileFormat = "[Desktop Entry]\n"
"Name=Game %s\n"
"Exec=%s %%u\n" // note: it really wants that %u in there
"Type=Application\n"
"NoDisplay=true\n"
"Categories=Discord;Games;\n"
"MimeType=x-scheme-handler/discord-%s;\n";
"Name=Game %s\n"
"Exec=%s %%u\n" // note: it really wants that %u in there
"Type=Application\n"
"NoDisplay=true\n"
"Categories=Discord;Games;\n"
"MimeType=x-scheme-handler/discord-%s;\n";
char desktopFile[2048];
int fileLen = snprintf(
desktopFile, sizeof(desktopFile), desktopFileFormat, applicationId, command, applicationId);
Expand Down
3 changes: 2 additions & 1 deletion libraries/discordrpc/src/serialization.h
Expand Up @@ -10,7 +10,8 @@
#pragma warning(disable : 4464) // relative include path contains
#pragma warning(disable : 4668) // is not defined as a preprocessor macro
#pragma warning(disable : 6313) // Incorrect operator
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
#pragma warning(disable : 5045) // Compiler will insert Spectre mitigation for memory load if
// /Qspectre switch specified
#endif // __MINGW32__

#include "rapidjson/document.h"
Expand Down

0 comments on commit 6b4561f

Please sign in to comment.