Skip to content

Commit 87512b6

Browse files
Merge branch 'release-6.1.0' into ARM64
2 parents e2269f9 + 13593f7 commit 87512b6

5 files changed

Lines changed: 12 additions & 5 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a6ca0408958589a77c34ca7d599e69df7e15e5c3e9a30471dfe3b2c9e707c448
3-
size 171696
2+
oid sha256:bb24e7d9a3e2526448aacde91b9071582cfff096315f277148318d5a62ff77af
3+
size 171488

etc/PackageConfigurations/eos_package_description.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
"source_to_dest": [
33

44
{"src": "etc/PlatformSpecificAssets/EOS/*", "dest": "PlatformSpecificAssets~/EOS/", "recursive": true },
5-
{"src": "tools/bin/*", "dest": "bin~/", "recursive": true },
5+
{"src": "tools/bin/EOSBootstrapperTool.exe", "dest": "bin~/" },
6+
{"src": "tools/bin/EOSBootstrapper.exe", "dest": "bin~/" },
7+
{"src": "tools/bin/EAC/Windows/anticheat_integritytool.exe", "dest": "bin~/EAC/Windows/" },
8+
{"src": "tools/bin/EAC/Windows/anticheat_integritytool.cfg", "dest": "bin~/EAC/Windows/" },
9+
{"src": "tools/bin/EAC/Linux/anticheat_integritytool", "dest": "bin~/EAC/Linux/" },
10+
{"src": "tools/bin/EAC/Linux/anticheat_integritytool.cfg", "dest": "bin~/EAC/Linux/" },
11+
{"src": "tools/bin/EAC/Mac/anticheat_integritytool", "dest": "bin~/EAC/Mac/" },
12+
{"src": "tools/bin/EAC/Mac/anticheat_integritytool.cfg", "dest": "bin~/EAC/Mac/" },
613

714
{"src": "Assets/EOS.meta", "dest": "Runtime/" },
815
{"src": "Assets/EOS/*.png", "dest": "Runtime/EOS/" },

lib/NativeCode/DynamicLibraryLoaderHelper_macOS/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
CC=clang
2222
CXX=clang++
2323

24-
# clang -dynamiclib MicrophoneUtility_macOS.mm -arch x86_64 --std=c++11 -o MicrophoneUtility_macos.dylib
24+
# clang -dynamiclib MicrophoneUtility_macOS.mm -arch x86_64 --std=c++20 -o MicrophoneUtility_macos.dylib
2525

26-
CXXFLAGS = --std=c++11
26+
CXXFLAGS = --std=c++20
2727
DYLIBS = build/libDynamicLibraryLoaderHelper.dylib build/MicrophoneUtility_macos.dylib
2828
UNITY_META_FILES = libDynamicLibraryLoaderHelper.dylib.meta
2929

tools/bin/EAC/base_private.key

-1.19 KB
Binary file not shown.

tools/bin/EAC/base_public.cer

-1.14 KB
Binary file not shown.

0 commit comments

Comments
 (0)