mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2026-04-26 12:01:43 +00:00
Update coopnet / libjuice (#1002)
Updates libjuice to 1.6.2 and applied some bugfixes to coopnet's peering code. Confirmed to fix connection issues with DeadParrot's unusual networking topologies. Only fully tested win64, I cross compiled the rest of the libraries. Co-authored-by: MysterD <myster@d>
This commit is contained in:
parent
458d683e41
commit
7be78962ce
19 changed files with 6 additions and 4 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
# Libraries
|
||||
*.lib
|
||||
*.a
|
||||
*.la
|
||||
*.lo
|
||||
|
||||
|
|
@ -91,3 +90,4 @@ todo-old.txt
|
|||
*.DS_Store
|
||||
tools/ido5.3_compiler/usr/lib/libc.so.1
|
||||
/.vs
|
||||
tools/audiofile/libaudiofile.a
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -978,11 +978,11 @@ ifeq ($(COOPNET),1)
|
|||
ifeq ($(shell uname -m),arm64)
|
||||
LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac_arm/ -l coopnet
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_arm/libcoopnet.dylib
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_arm/libjuice.1.2.2.dylib
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_arm/libjuice.1.6.2.dylib
|
||||
else
|
||||
LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac_intel/ -l coopnet
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_intel/libcoopnet.dylib
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_intel/libjuice.1.2.2.dylib
|
||||
COOPNET_LIBS += ./lib/coopnet/mac_intel/libjuice.1.6.2.dylib
|
||||
endif
|
||||
else ifeq ($(TARGET_RPI),1)
|
||||
ifneq (,$(findstring aarch64,$(machine)))
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include <cstdint>
|
||||
extern "C" {
|
||||
class Connection;
|
||||
class Lobby;
|
||||
#endif
|
||||
|
||||
#include <stdbool.h>
|
||||
|
|
@ -43,7 +44,8 @@ typedef struct {
|
|||
uint64_t (*DestIdFunction)(uint64_t aInput);
|
||||
#if defined(__cplusplus)
|
||||
bool (*ConnectionIsAllowed)(Connection*, bool);
|
||||
void (*OnReceiveInfoBits)(Connection* aConnection, uint64_t aDestId, uint64_t aInfoBits, const char* aName);
|
||||
bool (*LobbyConnectionIsAllowed)(Connection*, Lobby*);
|
||||
void (*OnReceiveInfoBits)(Connection* aConnection, uint64_t aDestId, uint64_t aInfoBits, uint64_t aHash, const char* aName);
|
||||
#endif
|
||||
} CoopNetCallbacks;
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/coopnet/mac_arm/libjuice.1.6.2.dylib
Normal file
BIN
lib/coopnet/mac_arm/libjuice.1.6.2.dylib
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/coopnet/mac_intel/libjuice.1.6.2.dylib
Normal file
BIN
lib/coopnet/mac_intel/libjuice.1.6.2.dylib
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Reference in a new issue