Skip to content

Commit 24e9b3d

Browse files
update libraries after bgfx update
1 parent 9f06763 commit 24e9b3d

File tree

4 files changed

+10
-45
lines changed

4 files changed

+10
-45
lines changed

Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,21 +174,17 @@
174174
<!-- Debug Libraries -->
175175
<AdditionalDependencies>
176176
arcana.lib;
177-
astc-encoder.lib;
178177
BabylonNative.lib;
179178
bgfx.lib;
180179
bimg.lib;
181-
tinyexr.lib;
180+
bimg_encode.lib;
181+
bimg_decode.lib;
182182
bx.lib;
183183
Canvas.lib;
184-
edtaa3.lib;
185-
etc1.lib;
186-
etc2.lib;
187184
GenericCodeGend.lib;
188185
glslangd.lib;
189186
glslang-default-resource-limitsd.lib;
190187
Graphics.lib;
191-
iqa.lib;
192188
jsi.lib;
193189
JsRuntime.lib;
194190
MachineIndependentd.lib;
@@ -200,15 +196,12 @@
200196
NativeOptimizations.lib;
201197
NativeTracing.lib;
202198
NativeXr.lib;
203-
nvtt.lib;
204199
OGLCompilerd.lib;
205200
openxr_loaderd.lib;
206201
OSDependentd.lib;
207-
pvrtc.lib;
208202
spirv-cross-cored.lib;
209203
spirv-cross-hlsld.lib;
210204
SPIRVd.lib;
211-
squish.lib;
212205
UrlLib.lib;
213206
Window.lib;
214207
XMLHttpRequest.lib;
@@ -235,21 +228,17 @@
235228
<!-- Release Libraries -->
236229
<AdditionalDependencies>
237230
arcana.lib;
238-
astc-encoder.lib;
239231
BabylonNative.lib;
240232
bgfx.lib;
241233
bimg.lib;
242-
tinyexr.lib;
234+
bimg_encode.lib;
235+
bimg_decode.lib;
243236
bx.lib;
244237
Canvas.lib;
245-
edtaa3.lib;
246-
etc1.lib;
247-
etc2.lib;
248238
GenericCodeGen.lib;
249239
glslang.lib;
250240
glslang-default-resource-limits.lib;
251241
Graphics.lib;
252-
iqa.lib;
253242
jsi.lib;
254243
JsRuntime.lib;
255244
MachineIndependent.lib;
@@ -261,15 +250,12 @@
261250
NativeOptimizations.lib;
262251
NativeTracing.lib;
263252
NativeXr.lib;
264-
nvtt.lib;
265253
OGLCompiler.lib;
266254
openxr_loader.lib;
267255
OSDependent.lib;
268-
pvrtc.lib;
269256
spirv-cross-core.lib;
270257
spirv-cross-hlsl.lib;
271258
SPIRV.lib;
272-
squish.lib;
273259
UrlLib.lib;
274260
Window.lib;
275261
XMLHttpRequest.lib;

Package/BaseKit/react-native-babylon.podspec

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,14 @@ Pod::Spec.new do |s|
2121
'ios/libs/libBabylonNative.a',
2222
'ios/libs/libbgfx.a',
2323
'ios/libs/libbimg.a',
24+
'ios/libs/libbimg_encode.a',
25+
'ios/libs/libbimg_decode.a',
2426
'ios/libs/libbx.a',
2527
'ios/libs/libCanvas.a',
26-
'ios/libs/libedtaa3.a',
27-
'ios/libs/libetc1.a',
28-
'ios/libs/libetc2.a',
2928
'ios/libs/libGenericCodeGen.a',
3029
'ios/libs/libglslang-default-resource-limits.a',
3130
'ios/libs/libglslang.a',
3231
'ios/libs/libGraphics.a',
33-
'ios/libs/libiqa.a',
3432
'ios/libs/libJsRuntime.a',
3533
'ios/libs/libMachineIndependent.a',
3634
'ios/libs/libnapi.a',
@@ -39,15 +37,11 @@ Pod::Spec.new do |s|
3937
'ios/libs/libNativeInput.a',
4038
'ios/libs/libNativeOptimizations.a',
4139
'ios/libs/libNativeTracing.a',
42-
'ios/libs/libnvtt.a',
4340
'ios/libs/libOGLCompiler.a',
4441
'ios/libs/libOSDependent.a',
45-
'ios/libs/libpvrtc.a',
4642
'ios/libs/libspirv-cross-core.a',
4743
'ios/libs/libspirv-cross-msl.a',
4844
'ios/libs/libSPIRV.a',
49-
'ios/libs/libsquish.a',
50-
'ios/libs/libtinyexr.a',
5145
'ios/libs/libUrlLib.a',
5246
'ios/libs/libWindow.a',
5347
'ios/libs/libXMLHttpRequest.a'

Package/gulpfile.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ const validateAssemblediOSAndroid = async () => {
529529
`${assemblediOSAndroidDir}/ios/EngineViewManager.mm`,
530530
`${assemblediOSAndroidDir}/ios/include`,
531531
`${assemblediOSAndroidDir}/ios/libs`,
532-
`${assemblediOSAndroidDir}/ios/libs/libastc-encoder.a`,
533532
`${assemblediOSAndroidDir}/ios/libs/libBabylonNative.a`,
534533
`${assemblediOSAndroidDir}/ios/libs/libbgfx.a`,
535534
`${assemblediOSAndroidDir}/ios/libs/libbimg.a`,
@@ -553,14 +552,8 @@ const validateAssemblediOSAndroid = async () => {
553552
`${assemblediOSAndroidDir}/ios/libs/libspirv-cross-core.a`,
554553
`${assemblediOSAndroidDir}/ios/libs/libspirv-cross-msl.a`,
555554
`${assemblediOSAndroidDir}/ios/libs/libSPIRV.a`,
556-
`${assemblediOSAndroidDir}/ios/libs/libtinyexr.a`,
557-
`${assemblediOSAndroidDir}/ios/libs/libetc1.a`,
558-
`${assemblediOSAndroidDir}/ios/libs/libetc2.a`,
559-
`${assemblediOSAndroidDir}/ios/libs/libnvtt.a`,
560-
`${assemblediOSAndroidDir}/ios/libs/libsquish.a`,
561-
`${assemblediOSAndroidDir}/ios/libs/libpvrtc.a`,
562-
`${assemblediOSAndroidDir}/ios/libs/libiqa.a`,
563-
`${assemblediOSAndroidDir}/ios/libs/libedtaa3.a`,
555+
`${assemblediOSAndroidDir}/ios/libs/libbimg_encode.a`,
556+
`${assemblediOSAndroidDir}/ios/libs/libbimg_decode.a`,
564557
`${assemblediOSAndroidDir}/ios/libs/libUrlLib.a`,
565558
`${assemblediOSAndroidDir}/ios/libs/libWindow.a`,
566559
`${assemblediOSAndroidDir}/ios/libs/libXMLHttpRequest.a`,

Package/iOS/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,8 @@ project(ReactNativeBabylon)
2323
include(${CMAKE_CURRENT_SOURCE_DIR}/../../Apps/${BUILD_RNAPP_DIR}/node_modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt)
2424

2525
set(PACKAGED_LIBS
26-
astc-encoder
27-
etc1
28-
etc2
29-
nvtt
30-
squish
31-
pvrtc
32-
iqa
33-
edtaa3
34-
tinyexr
26+
bimg_encode
27+
bimg_decode
3528
bgfx
3629
bimg
3730
bx
@@ -55,7 +48,6 @@ set(PACKAGED_LIBS
5548
SPIRV
5649
spirv-cross-core
5750
spirv-cross-msl
58-
tinyexr
5951
UrlLib
6052
Window
6153
XMLHttpRequest

0 commit comments

Comments
 (0)