6 Commits

Author SHA1 Message Date
Rémi Verschelde
e63c15737c Merge pull request #13 from bruvzg/astc_dedup
Remove duplicate ASTC encoder code.
2024-07-30 11:25:16 +02:00
bruvzg
5a278e6e5c Remove duplicate ASTC encoder code. 2024-07-29 09:59:30 +03:00
Rémi Verschelde
5b179da688 Merge pull request #12 from bruvzg/win_7
[Windows] Switch from Windows 8+ futex to std::mutex.
2024-07-28 17:52:01 +02:00
bruvzg
4c3ee872b5 [Windows] Switch from Windows 8+ futex to std::mutex. 2024-07-27 17:10:20 +03:00
Rémi Verschelde
81fb08a490 Merge pull request #10 from bruvzg/remove-arm32
[CI] Remove 32-bit ARM build.
2024-07-26 14:17:27 +02:00
bruvzg
1c2e321260 [CI] Remove 32-bit ARM build. 2024-07-26 14:37:12 +03:00
2 changed files with 1 additions and 32 deletions

View File

@@ -121,15 +121,6 @@ jobs:
artifact-path-gles: bin/libGLES.windows.arm64.lib
flags: use_mingw=no arch=arm64
- name: 🏁 Windows - MSVC arm32
platform: windows
os: windows-2019
artifact-name: godot-angle-static-arm32-msvc-release
artifact-path-angle: bin/libANGLE.windows.arm32.lib
artifact-path-egl: bin/libEGL.windows.arm32.lib
artifact-path-gles: bin/libGLES.windows.arm32.lib
flags: use_mingw=no arch=arm32
# MinGW/GCC libs using MSVCRT
- name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
platform: windows

View File

@@ -489,29 +489,6 @@ angle_sources = [
"third_party/zlib/trees.c",
"third_party/zlib/uncompr.c",
"third_party/zlib/zutil.c",
"third_party/astc-encoder/src/Source/astcenc_averages_and_directions.cpp",
"third_party/astc-encoder/src/Source/astcenc_block_sizes.cpp",
"third_party/astc-encoder/src/Source/astcenc_color_quantize.cpp",
"third_party/astc-encoder/src/Source/astcenc_color_unquantize.cpp",
"third_party/astc-encoder/src/Source/astcenc_compress_symbolic.cpp",
"third_party/astc-encoder/src/Source/astcenc_compute_variance.cpp",
"third_party/astc-encoder/src/Source/astcenc_decompress_symbolic.cpp",
"third_party/astc-encoder/src/Source/astcenc_diagnostic_trace.cpp",
"third_party/astc-encoder/src/Source/astcenc_entry.cpp",
"third_party/astc-encoder/src/Source/astcenc_find_best_partitioning.cpp",
"third_party/astc-encoder/src/Source/astcenc_ideal_endpoints_and_weights.cpp",
"third_party/astc-encoder/src/Source/astcenc_image.cpp",
"third_party/astc-encoder/src/Source/astcenc_integer_sequence.cpp",
"third_party/astc-encoder/src/Source/astcenc_mathlib_softfloat.cpp",
"third_party/astc-encoder/src/Source/astcenc_mathlib.cpp",
"third_party/astc-encoder/src/Source/astcenc_partition_tables.cpp",
"third_party/astc-encoder/src/Source/astcenc_percentile_tables.cpp",
"third_party/astc-encoder/src/Source/astcenc_pick_best_endpoint_format.cpp",
"third_party/astc-encoder/src/Source/astcenc_platform_isa_detection.cpp",
"third_party/astc-encoder/src/Source/astcenc_quantization.cpp",
"third_party/astc-encoder/src/Source/astcenc_symbolic_physical.cpp",
"third_party/astc-encoder/src/Source/astcenc_weight_align.cpp",
"third_party/astc-encoder/src/Source/astcenc_weight_quant_xfer_tables.cpp",
]
if env["platform"] == "macos":
angle_sources += [
@@ -799,6 +776,7 @@ if env["platform"] == "macos":
env.Append(CCFLAGS=["-fno-objc-arc", "-fno-objc-msgsend-selector-stubs", "-Wno-unused-command-line-argument"])
if env["platform"] == "windows":
env.Append(CPPDEFINES=[("ANGLE_IS_WIN", 1)])
env.Append(CPPDEFINES=[("ANGLE_WINDOWS_NO_FUTEX", 1)])
env.Append(
CPPDEFINES=[
(