Skip to content

Commit 7472914

Browse files
committed
Merge branch 'ver/1.21.1' into feature/dfc-v0
2 parents 8e26af8 + 43dec92 commit 7472914

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
with:
2828
version: "18.1.8"
2929

30-
- name: Install MinGW and other required dependencies
31-
run: sudo apt install mingw-w64 libtinfo5 crossbuild-essential-arm64
30+
- name: Install required dependencies
31+
run: sudo apt install libtinfo5
3232

3333
- uses: actions/cache@v4
3434
with:

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
with:
3232
version: "18.1.8"
3333

34-
- name: Install MinGW and other required dependencies
35-
run: sudo apt install mingw-w64 libtinfo5 crossbuild-essential-arm64
34+
- name: Install required dependencies
35+
run: sudo apt install libtinfo5
3636

3737
- uses: actions/cache@v4
3838
with:

c2me-opts-natives-math/src/c/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ set(CMAKE_C_COMPILER clang)
99

1010
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g")
1111

12+
set(CMAKE_C_STANDARD_LIBRARIES "")
13+
set(CMAKE_CXX_STANDARD_LIBRARIES "")
14+
1215
add_library(c2me-opts-natives-math SHARED
1316
exports.c
1417
system_isa_x86_64.c
@@ -25,4 +28,5 @@ execute_process(COMMAND llvm-config --prefix OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_
2528

2629
target_include_directories(c2me-opts-natives-math PRIVATE includes/)
2730
target_compile_options(c2me-opts-natives-math PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wpedantic -ffreestanding -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix -fno-math-errno -mprefer-vector-width=512 -ffp-contract=off -Rpass-analysis=loop-vectorize -mno-stack-arg-probe -fsave-optimization-record "SHELL:-mllvm -extra-vectorizer-passes" "SHELL:-mllvm -slp-vectorize-hor-store" "SHELL:-mllvm -slp-min-tree-size=1" "SHELL:-mllvm -slp-min-reg-size=64" "SHELL:-mllvm -slp-threshold=-1" "SHELL:-mllvm -enable-epilogue-vectorization">)
28-
target_link_options(c2me-opts-natives-math PRIVATE -nostdlib -fuse-ld=lld -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix)
31+
target_link_options(c2me-opts-natives-math PRIVATE -v -nostdlib -fuse-ld=lld -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix)
32+

src/main/resources/fabric.mod.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,5 @@
3737
"breaks": {
3838
"tic_tacs": "*",
3939
"optifabric": "*"
40-
},
41-
42-
"custom": {
43-
"_lithium_toggle_comment": "We disable the player_chunk_tick mixin as some weird incompatibility is present, you are free to remove this and test the incompatibility issue",
44-
"lithium:options": {
45-
"mixin.world.player_chunk_tick": false
46-
}
4740
}
4841
}

0 commit comments

Comments
 (0)