fix(ci): added linux aarch64 libs and fixed workflows

BoySanic · May 1, 2021 · b4f10aa · b4f10aa
1 parent 27b1028
commit b4f10aa
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: msys2/setup-msys2@v2
     - name: build
       run: |
-       g++ filter9000-boinc.cpp -o filter9000.exe ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/win -lstdc++ -static -static-libstdc++ -D_WIN64 -DBOINC -DWIN64 -D_WIN32 -DWIN32 -lboinc_api -lboinc
+       g++ filter9000-boinc.cpp -o filter9000.exe ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/x86_64/win -lstdc++ -static -static-libstdc++ -D_WIN64 -DBOINC -DWIN64 -D_WIN32 -DWIN32 -lboinc_api -lboinc
        dir
     - uses: actions/upload-artifact@v2
       with:
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: build
       run: |
-        g++ filter9000-boinc.cpp -o filter9000 ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/lin -lstdc++ -static -static-libstdc++ -DBOINC -lboinc_api -lboinc -pthread
+        g++ filter9000-boinc.cpp -o filter9000 ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/x86_64/lin -lstdc++ -static -static-libstdc++ -DBOINC -lboinc_api -lboinc -pthread
         ls -la
     - uses: actions/upload-artifact@v2
       with:
@@ -44,7 +44,7 @@ jobs:
         sudo apt install gcc-10-aarch64-linux-gnu
     - name: build
       run: |
-        aarch64-linux-gnu-g++-10 filter9000-boinc.cpp -o filter9000 ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/lin -lstdc++ -static -static-libstdc++ -DBOINC -lboinc_api -lboinc -pthread
+        aarch64-linux-gnu-g++-10 filter9000-boinc.cpp -o filter9000 ./Pieces/Stronghold.cpp ./Pieces/StrongholdPiece.cpp ./cubiomes/finders.c ./cubiomes/util.c ./cubiomes/generator.c ./cubiomes/layers.c -I./include -l:libboinc_api.a -l:libboinc.a -L./include/boinc/lib/aarch64/lin -lstdc++ -static -static-libstdc++ -DBOINC -lboinc_api -lboinc -pthread
         ls -la
     - uses: actions/upload-artifact@v2
       with:

diff --git a/boinc/lib/aarch64/lin/libboinc.a b/boinc/lib/aarch64/lin/libboinc.a
diff --git a/boinc/lib/aarch64/lin/libboinc_api.a b/boinc/lib/aarch64/lin/libboinc_api.a
diff --git a/boinc/lib/aarch64/lin/libboinc_opencl.a b/boinc/lib/aarch64/lin/libboinc_opencl.a
diff --git a/boinc/lib/lin/libboinc.a → boinc/lib/x86_64/lin/libboinc.a b/boinc/lib/lin/libboinc.a → boinc/lib/x86_64/lin/libboinc.a
diff --git a/boinc/lib/lin/libboinc_api.a → boinc/lib/x86_64/lin/libboinc_api.a b/boinc/lib/lin/libboinc_api.a → boinc/lib/x86_64/lin/libboinc_api.a
diff --git a/boinc/lib/lin/libboinc_opencl.a → boinc/lib/x86_64/lin/libboinc_opencl.a b/boinc/lib/lin/libboinc_opencl.a → boinc/lib/x86_64/lin/libboinc_opencl.a
diff --git a/boinc/lib/lin/libs.txt → boinc/lib/x86_64/lin/libs.txt b/boinc/lib/lin/libs.txt → boinc/lib/x86_64/lin/libs.txt
diff --git a/boinc/lib/win/boinc.lib → boinc/lib/x86_64/win/boinc.lib b/boinc/lib/win/boinc.lib → boinc/lib/x86_64/win/boinc.lib
diff --git a/boinc/lib/win/boinc_api.lib → boinc/lib/x86_64/win/boinc_api.lib b/boinc/lib/win/boinc_api.lib → boinc/lib/x86_64/win/boinc_api.lib
diff --git a/boinc/lib/win/boinc_graphics2.lib → boinc/lib/x86_64/win/boinc_graphics2.lib b/boinc/lib/win/boinc_graphics2.lib → boinc/lib/x86_64/win/boinc_graphics2.lib
diff --git a/boinc/lib/win/boinc_opencl.lib → boinc/lib/x86_64/win/boinc_opencl.lib b/boinc/lib/win/boinc_opencl.lib → boinc/lib/x86_64/win/boinc_opencl.lib