Compare commits
3
Commits
develop-24
...
v3.8.0-7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e867c50ca | ||
|
|
9d201cd6d3 | ||
|
|
712e10655a |
Vendored
+9
-1
@@ -1,7 +1,15 @@
|
|||||||
declare module 'external:emscripten/*.wasm' {
|
declare module 'external:emscripten/*.wasm' {
|
||||||
/**
|
/**
|
||||||
* This is a url relative from build output chunk.
|
* This is a wasm url relative from build output chunk.
|
||||||
*/
|
*/
|
||||||
const wasmPath: string;
|
const wasmPath: string;
|
||||||
export default wasmPath;
|
export default wasmPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
declare module 'external:emscripten/*.js.mem' {
|
||||||
|
/**
|
||||||
|
* This is a js.mem url relative from build output chunk.
|
||||||
|
*/
|
||||||
|
const jsMemPath: string;
|
||||||
|
export default jsMemPath;
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
Vendored
+1
-4
@@ -2,7 +2,7 @@ declare module 'external:emscripten/spine/spine.asm.js' {
|
|||||||
export default SpineWasm;
|
export default SpineWasm;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module 'external:emscripten/spine/spine.js' {
|
declare module 'external:emscripten/spine/spine.wasm.js' {
|
||||||
export default SpineWasm;
|
export default SpineWasm;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -10,10 +10,7 @@ declare module 'external:emscripten/spine/spine.js' {
|
|||||||
declare function SpineWasm (moduleOptions?: any): Promise<void>;
|
declare function SpineWasm (moduleOptions?: any): Promise<void>;
|
||||||
|
|
||||||
declare namespace SpineWasm {
|
declare namespace SpineWasm {
|
||||||
type ptr = number;
|
|
||||||
interface instance {
|
interface instance {
|
||||||
spine: any;
|
|
||||||
memory: any;
|
|
||||||
spineWasmInit(): void;
|
spineWasmInit(): void;
|
||||||
spineWasmDestroy(): void;
|
spineWasmDestroy(): void;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
+4
-2
@@ -143,7 +143,8 @@ add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
|
|||||||
set_target_properties(glslang-default-resource-limits PROPERTIES
|
set_target_properties(glslang-default-resource-limits PROPERTIES
|
||||||
IMPORTED_LOCATION ${ohos_lib_dir}/libglslang-default-resource-limits.a
|
IMPORTED_LOCATION ${ohos_lib_dir}/libglslang-default-resource-limits.a
|
||||||
)
|
)
|
||||||
set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits MachineIndependent GenericCodeGen)
|
# Unable to link MachineIndependent with GenericCodeGen
|
||||||
|
set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-resource-limits)
|
||||||
|
|
||||||
if(USE_PHYSICS_PHYSX)
|
if(USE_PHYSICS_PHYSX)
|
||||||
set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
|
set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
|
||||||
@@ -214,7 +215,8 @@ list(APPEND CC_EXTERNAL_INCLUDES
|
|||||||
${platform_spec_path}/include/v8
|
${platform_spec_path}/include/v8
|
||||||
${platform_spec_path}/include/sqlite
|
${platform_spec_path}/include/sqlite
|
||||||
${platform_spec_path}/include/png16
|
${platform_spec_path}/include/png16
|
||||||
${platform_spec_path}/include/uv
|
# Will conflict with the header file of harmonyos' standard library (error.h).
|
||||||
|
# ${platform_spec_path}/include/uv
|
||||||
)
|
)
|
||||||
|
|
||||||
#TODO: remove in future version
|
#TODO: remove in future version
|
||||||
|
|||||||
Reference in New Issue
Block a user