diff --git a/.gitignore b/.gitignore index 771495a46..c42e9ef03 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile b/Makefile index 0fc235b8e..94eb9478f 100644 --- a/Makefile +++ b/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))) diff --git a/lib/coopnet/include/libcoopnet.h b/lib/coopnet/include/libcoopnet.h index 433ccab58..8fff4caef 100644 --- a/lib/coopnet/include/libcoopnet.h +++ b/lib/coopnet/include/libcoopnet.h @@ -5,6 +5,7 @@ #include extern "C" { class Connection; +class Lobby; #endif #include @@ -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; diff --git a/lib/coopnet/linux/libcoopnet-arm.a b/lib/coopnet/linux/libcoopnet-arm.a index aa64895ca..ed26e39dd 100644 Binary files a/lib/coopnet/linux/libcoopnet-arm.a and b/lib/coopnet/linux/libcoopnet-arm.a differ diff --git a/lib/coopnet/linux/libcoopnet-arm64.a b/lib/coopnet/linux/libcoopnet-arm64.a index 37cf815d1..bf2fadb65 100644 Binary files a/lib/coopnet/linux/libcoopnet-arm64.a and b/lib/coopnet/linux/libcoopnet-arm64.a differ diff --git a/lib/coopnet/linux/libcoopnet.a b/lib/coopnet/linux/libcoopnet.a index 40a7dbc7d..bed8d5435 100644 Binary files a/lib/coopnet/linux/libcoopnet.a and b/lib/coopnet/linux/libcoopnet.a differ diff --git a/lib/coopnet/linux/libjuice-arm.a b/lib/coopnet/linux/libjuice-arm.a index 42d37f1c1..e510856c8 100644 Binary files a/lib/coopnet/linux/libjuice-arm.a and b/lib/coopnet/linux/libjuice-arm.a differ diff --git a/lib/coopnet/linux/libjuice-arm64.a b/lib/coopnet/linux/libjuice-arm64.a index d49379be8..b631788ce 100644 Binary files a/lib/coopnet/linux/libjuice-arm64.a and b/lib/coopnet/linux/libjuice-arm64.a differ diff --git a/lib/coopnet/linux/libjuice.a b/lib/coopnet/linux/libjuice.a index 0f847c6dc..fe3144b56 100644 Binary files a/lib/coopnet/linux/libjuice.a and b/lib/coopnet/linux/libjuice.a differ diff --git a/lib/coopnet/mac_arm/libcoopnet.dylib b/lib/coopnet/mac_arm/libcoopnet.dylib index 324e4acac..8d8604a5e 100755 Binary files a/lib/coopnet/mac_arm/libcoopnet.dylib and b/lib/coopnet/mac_arm/libcoopnet.dylib differ diff --git a/lib/coopnet/mac_arm/libjuice.1.2.2.dylib b/lib/coopnet/mac_arm/libjuice.1.2.2.dylib deleted file mode 100755 index fceed5bff..000000000 Binary files a/lib/coopnet/mac_arm/libjuice.1.2.2.dylib and /dev/null differ diff --git a/lib/coopnet/mac_arm/libjuice.1.6.2.dylib b/lib/coopnet/mac_arm/libjuice.1.6.2.dylib new file mode 100644 index 000000000..488363745 Binary files /dev/null and b/lib/coopnet/mac_arm/libjuice.1.6.2.dylib differ diff --git a/lib/coopnet/mac_intel/libcoopnet.dylib b/lib/coopnet/mac_intel/libcoopnet.dylib index 372196103..c0dcdd5aa 100755 Binary files a/lib/coopnet/mac_intel/libcoopnet.dylib and b/lib/coopnet/mac_intel/libcoopnet.dylib differ diff --git a/lib/coopnet/mac_intel/libjuice.1.2.2.dylib b/lib/coopnet/mac_intel/libjuice.1.2.2.dylib deleted file mode 100755 index e28f26f86..000000000 Binary files a/lib/coopnet/mac_intel/libjuice.1.2.2.dylib and /dev/null differ diff --git a/lib/coopnet/mac_intel/libjuice.1.6.2.dylib b/lib/coopnet/mac_intel/libjuice.1.6.2.dylib new file mode 100644 index 000000000..7734ce9a5 Binary files /dev/null and b/lib/coopnet/mac_intel/libjuice.1.6.2.dylib differ diff --git a/lib/coopnet/win32/libcoopnet.a b/lib/coopnet/win32/libcoopnet.a index d90f75e64..1bd2e0509 100644 Binary files a/lib/coopnet/win32/libcoopnet.a and b/lib/coopnet/win32/libcoopnet.a differ diff --git a/lib/coopnet/win32/libjuice.a b/lib/coopnet/win32/libjuice.a index 8e7d880d4..43cfd480e 100644 Binary files a/lib/coopnet/win32/libjuice.a and b/lib/coopnet/win32/libjuice.a differ diff --git a/lib/coopnet/win64/libcoopnet.a b/lib/coopnet/win64/libcoopnet.a index 1613bb7c5..7f91e04d6 100644 Binary files a/lib/coopnet/win64/libcoopnet.a and b/lib/coopnet/win64/libcoopnet.a differ diff --git a/lib/coopnet/win64/libjuice.a b/lib/coopnet/win64/libjuice.a index 1bee9d6cf..0bd197237 100644 Binary files a/lib/coopnet/win64/libjuice.a and b/lib/coopnet/win64/libjuice.a differ