Skip to content

Commit 560ae99

Browse files
FernthedevFernthedev
committed
Update to BS 1.40
1 parent 8e159fb commit 560ae99

File tree

4 files changed

+115
-110
lines changed

4 files changed

+115
-110
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ add_compile_definitions(USE_CODEGEN_FIELDS)
2929
RECURSE_FILES(cpp_file_list ${SOURCE_DIR}/*.cpp)
3030
RECURSE_FILES(c_file_list ${SOURCE_DIR}/*.c)
3131

32+
33+
RECURSE_FILES(inline_hook_c ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.c)
34+
RECURSE_FILES(inline_hook_cpp ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.cpp)
35+
3236
# add all src files to compile
3337
add_library(
3438
${COMPILE_ID}
3539
SHARED
3640
${cpp_file_list}
3741
${c_file_list}
42+
${inline_hook_c}
43+
${inline_hook_cpp}
3844
)
3945

4046
# add src dir as include dir

‎qpm.json‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,35 @@
1212
"cmake": true
1313
}
1414
},
15+
"workspace": {
16+
"scripts": {
17+
"build": [
18+
"pwsh ./build.ps1"
19+
]
20+
},
21+
"qmodIncludeDirs": [
22+
"./build",
23+
"./extern/libs"
24+
],
25+
"qmodIncludeFiles": [],
26+
"qmodOutput": "Tracks.qmod"
27+
},
1528
"dependencies": [
1629
{
1730
"id": "beatsaber-hook",
18-
"versionRange": "^5.1.7",
19-
"additionalData": {
20-
"extraFiles": ["src/inline-hook"]
21-
}
31+
"versionRange": "^6.1.7",
32+
"additionalData": {}
2233
},
2334
{
2435
"id": "bs-cordl",
25-
"versionRange": "^3700.0.0",
36+
"versionRange": "^4000.0.0",
2637
"additionalData": {
2738
"includeQmod": true
2839
}
2940
},
3041
{
3142
"id": "custom-json-data",
32-
"versionRange": "^0.21.0",
43+
"versionRange": "^0.22.0",
3344
"additionalData": {}
3445
},
3546
{
@@ -44,27 +55,20 @@
4455
},
4556
{
4657
"id": "custom-types",
47-
"versionRange": "^0.17.0",
58+
"versionRange": "^0.18.0",
4859
"additionalData": {
4960
"includeQmod": true
5061
}
5162
},
5263
{
53-
"id": "paper",
54-
"versionRange": "*",
64+
"id": "songcore",
65+
"versionRange": "^1.1.0",
5566
"additionalData": {}
5667
},
5768
{
58-
"id": "songcore",
59-
"versionRange": "^1.1.0",
69+
"id": "paper2_scotland2",
70+
"versionRange": "^4.4.1",
6071
"additionalData": {}
6172
}
62-
],
63-
"workspace": {
64-
"scripts": {
65-
"build": ["pwsh ./build.ps1"]
66-
},
67-
"qmodIncludeDirs": ["./build", "./extern/libs"],
68-
"qmodOutput": "Tracks.qmod"
69-
}
70-
}
73+
]
74+
}

‎qpm.shared.json‎

Lines changed: 57 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,19 @@
2929
"dependencies": [
3030
{
3131
"id": "beatsaber-hook",
32-
"versionRange": "^5.1.7",
33-
"additionalData": {
34-
"extraFiles": [
35-
"src/inline-hook"
36-
]
37-
}
32+
"versionRange": "^6.1.7",
33+
"additionalData": {}
3834
},
3935
{
4036
"id": "bs-cordl",
41-
"versionRange": "^3700.0.0",
37+
"versionRange": "^4000.0.0",
4238
"additionalData": {
4339
"includeQmod": true
4440
}
4541
},
4642
{
4743
"id": "custom-json-data",
48-
"versionRange": "^0.21.0",
44+
"versionRange": "^0.22.0",
4945
"additionalData": {}
5046
},
5147
{
@@ -60,34 +56,33 @@
6056
},
6157
{
6258
"id": "custom-types",
63-
"versionRange": "^0.17.0",
59+
"versionRange": "^0.18.0",
6460
"additionalData": {
6561
"includeQmod": true
6662
}
6763
},
6864
{
69-
"id": "paper",
70-
"versionRange": "*",
65+
"id": "songcore",
66+
"versionRange": "^1.1.0",
7167
"additionalData": {}
7268
},
7369
{
74-
"id": "songcore",
75-
"versionRange": "^1.1.0",
70+
"id": "paper2_scotland2",
71+
"versionRange": "^4.4.1",
7672
"additionalData": {}
7773
}
7874
]
7975
},
8076
"restoredDependencies": [
8177
{
8278
"dependency": {
83-
"id": "paper",
84-
"versionRange": "=3.6.4",
79+
"id": "paper2_scotland2",
80+
"versionRange": "=4.4.1",
8581
"additionalData": {
86-
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/libpaperlog.so",
87-
"debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/debug_libpaperlog.so",
88-
"overrideSoName": "libpaperlog.so",
89-
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/paperlog.qmod",
90-
"branchName": "version/v3_6_4",
82+
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.4.1/libpaper2_scotland2.so",
83+
"overrideSoName": "libpaper2_scotland2.so",
84+
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.4.1/paper2_scotland2.qmod",
85+
"branchName": "version/v4_4_1",
9186
"compileOptions": {
9287
"systemIncludes": [
9388
"shared/utfcpp/source"
@@ -96,29 +91,34 @@
9691
"cmake": false
9792
}
9893
},
99-
"version": "3.6.4"
94+
"version": "4.4.1"
10095
},
10196
{
10297
"dependency": {
10398
"id": "libil2cpp",
104-
"versionRange": "=0.3.2",
99+
"versionRange": "=0.4.0",
105100
"additionalData": {
106101
"headersOnly": true,
107-
"cmake": false
102+
"compileOptions": {
103+
"systemIncludes": [
104+
"il2cpp/external/baselib/Include",
105+
"il2cpp/external/baselib/Platforms/Android/Include"
106+
]
107+
}
108108
}
109109
},
110-
"version": "0.3.2"
110+
"version": "0.4.0"
111111
},
112112
{
113113
"dependency": {
114114
"id": "custom-types",
115-
"versionRange": "=0.17.10",
115+
"versionRange": "=0.18.2",
116116
"additionalData": {
117-
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/libcustom-types.so",
118-
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/debug_libcustom-types.so",
117+
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/libcustom-types.so",
118+
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/debug_libcustom-types.so",
119119
"overrideSoName": "libcustom-types.so",
120-
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/CustomTypes.qmod",
121-
"branchName": "version/v0_17_10",
120+
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.2/CustomTypes.qmod",
121+
"branchName": "version/v0_18_2",
122122
"compileOptions": {
123123
"cppFlags": [
124124
"-Wno-invalid-offsetof"
@@ -127,29 +127,25 @@
127127
"cmake": true
128128
}
129129
},
130-
"version": "0.17.10"
130+
"version": "0.18.2"
131131
},
132132
{
133133
"dependency": {
134134
"id": "sombrero",
135-
"versionRange": "=0.1.42",
135+
"versionRange": "=0.1.43",
136136
"additionalData": {
137137
"headersOnly": true,
138-
"branchName": "version/v0_1_42"
138+
"branchName": "version/v0_1_43"
139139
}
140140
},
141-
"version": "0.1.42"
141+
"version": "0.1.43"
142142
},
143143
{
144144
"dependency": {
145145
"id": "custom-json-data",
146-
"versionRange": "=0.21.5",
146+
"versionRange": "=0.22.0",
147147
"additionalData": {
148-
"soLink": "https://github.com/StackDoubleFlow/CustomJSONData/releases/download/v0.21.5/libcustom-json-data.so",
149-
"debugSoLink": "https://github.com/StackDoubleFlow/CustomJSONData/releases/download/v0.21.5/debug_libcustom-json-data.so",
150148
"overrideSoName": "libcustom-json-data.so",
151-
"modLink": "https://github.com/StackDoubleFlow/CustomJSONData/releases/download/v0.21.5/custom-json-data.qmod",
152-
"branchName": "version/v0_21_5",
153149
"compileOptions": {
154150
"cppFlags": [
155151
"-DRAPIDJSON_NEON"
@@ -158,15 +154,15 @@
158154
"cmake": true
159155
}
160156
},
161-
"version": "0.21.5"
157+
"version": "0.22.0"
162158
},
163159
{
164160
"dependency": {
165161
"id": "bs-cordl",
166-
"versionRange": "=3700.0.0",
162+
"versionRange": "=4000.1.1",
167163
"additionalData": {
168164
"headersOnly": true,
169-
"branchName": "version/v3700_0_0",
165+
"branchName": "version/v4000_1_1",
170166
"compileOptions": {
171167
"includePaths": [
172168
"include"
@@ -176,61 +172,60 @@
176172
"-DNEED_UNSAFE_CSHARP",
177173
"-fdeclspec",
178174
"-DUNITY_2021",
179-
"-DHAS_CODEGEN"
175+
"-DHAS_CODEGEN",
176+
"-Wno-invalid-offsetof"
180177
]
181178
}
182179
}
183180
},
184-
"version": "3700.0.0"
181+
"version": "4000.1.1"
185182
},
186183
{
187184
"dependency": {
188185
"id": "songcore",
189-
"versionRange": "=1.1.14",
186+
"versionRange": "=1.2.0",
190187
"additionalData": {
191-
"soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/libsongcore.so",
192-
"debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/debug_libsongcore.so",
193188
"overrideSoName": "libsongcore.so",
194-
"modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.14/SongCore.qmod",
195-
"branchName": "version/v1_1_14",
196189
"cmake": true
197190
}
198191
},
199-
"version": "1.1.14"
192+
"version": "1.2.0"
200193
},
201194
{
202195
"dependency": {
203196
"id": "beatsaber-hook",
204-
"versionRange": "=5.1.9",
197+
"versionRange": "=6.4.0",
205198
"additionalData": {
206-
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/libbeatsaber-hook_5_1_9.so",
207-
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/debug_libbeatsaber-hook_5_1_9.so",
208-
"branchName": "version/v5_1_9",
199+
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/libbeatsaber-hook.so",
200+
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/debug_libbeatsaber-hook.so",
201+
"overrideSoName": "libbeatsaber-hook.so",
202+
"modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.0/beatsaber-hook.qmod",
203+
"branchName": "version/v6_4_0",
209204
"cmake": true
210205
}
211206
},
212-
"version": "5.1.9"
207+
"version": "6.4.0"
213208
},
214209
{
215210
"dependency": {
216211
"id": "scotland2",
217-
"versionRange": "=0.1.4",
212+
"versionRange": "=0.1.6",
218213
"additionalData": {
219-
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/libsl2.so",
220-
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/debug_libsl2.so",
214+
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so",
215+
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so",
221216
"overrideSoName": "libsl2.so",
222-
"branchName": "version/v0_1_4"
217+
"branchName": "version/v0_1_6"
223218
}
224219
},
225-
"version": "0.1.4"
220+
"version": "0.1.6"
226221
},
227222
{
228223
"dependency": {
229224
"id": "fmt",
230-
"versionRange": "=10.0.0",
225+
"versionRange": "=11.0.2",
231226
"additionalData": {
232227
"headersOnly": true,
233-
"branchName": "version/v10_0_0",
228+
"branchName": "version/v11_0_2",
234229
"compileOptions": {
235230
"systemIncludes": [
236231
"fmt/include/"
@@ -241,7 +236,7 @@
241236
}
242237
}
243238
},
244-
"version": "10.0.0"
239+
"version": "11.0.2"
245240
}
246241
]
247242
}

0 commit comments

Comments
 (0)