etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 05:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update win64 coopnet

Browse source
This commit is contained in:
MysterD 2023-06-14 01:38:19 -07:00
parent 61b72ae1ee
commit f35a6621dc
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -976,9 +976,9 @@ COOPNET_LIBS :=
ifeq ($(COOPNET),1) ifeq ($(COOPNET),1)
ifeq ($(WINDOWS_BUILD),1) ifeq ($(WINDOWS_BUILD),1)
ifeq ($(TARGET_BITS), 32) ifeq ($(TARGET_BITS), 32)
LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi
else else
LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi
endif endif
else ifeq ($(OSX_BUILD),1) else ifeq ($(OSX_BUILD),1)
LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac/ -l coopnet LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac/ -l coopnet

BIN
lib/coopnet/win64/libcoopnet.a
View file

Binary file not shown.

4
src/pc/discord/discord.c
View file

@ -36,9 +36,13 @@ void discord_fatal(int rc) {
} }
if (rc != DiscordResult_Ok) { if (rc != DiscordResult_Ok) {
static sDiscordReported = false;
if (!sDiscordReported) {
sDiscordReported = true;
LOG_ERROR("Discord threw an error. RC: %d", rc); LOG_ERROR("Discord threw an error. RC: %d", rc);
} }
} }
}
static void get_oauth2_token_callback(UNUSED void* data, enum EDiscordResult result, struct DiscordOAuth2Token* token) { static void get_oauth2_token_callback(UNUSED void* data, enum EDiscordResult result, struct DiscordOAuth2Token* token) {
LOG_INFO("> get_oauth2_token_callback returned %d", result); LOG_INFO("> get_oauth2_token_callback returned %d", result);

2
src/pc/gfx/gfx_cc.c
View file

@ -68,7 +68,7 @@ void gfx_cc_print(struct ColorCombiner *cc) {
printf("0x%08x", cm->flags); printf("0x%08x", cm->flags);
printf(");"); printf(");");
printf(" // %016lx", cm->hash); printf(" // %016" PRIx64, cm->hash);
printf("\n"); printf("\n");
#endif #endif
} }

2
src/pc/network/packets/packet_chat.c
View file

@ -100,7 +100,7 @@ void network_receive_chat(struct Packet* p) {
// add the message // add the message
djui_chat_message_create_from(globalIndex, remoteMessage); djui_chat_message_create_from(globalIndex, remoteMessage);
if (gNetworkSystem && gNetworkSystem->get_id_str && np && np->name) { if (gNetworkSystem && gNetworkSystem->get_id_str && np) {
LOG_CONSOLE("[%s] %s: %s", gNetworkSystem->get_id_str(np->localIndex), np->name, remoteMessage); LOG_CONSOLE("[%s] %s: %s", gNetworkSystem->get_id_str(np->localIndex), np->name, remoteMessage);
} }
LOG_INFO("rx chat: %s", remoteMessage); LOG_INFO("rx chat: %s", remoteMessage);