Skip to content

Commit 45f4923

Browse files
committed
modify:freebsd build compiler to clang and ci add ubuntu26
1 parent ac521ca commit 45f4923

9 files changed

Lines changed: 40 additions & 7 deletions

File tree

‎.github/workflows/ubuntubuild.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
include:
1414
- os: ubuntu-22.04
1515
- os: ubuntu-24.04
16+
- os: ubuntu-26.04
1617
- os: ubuntu-22.04-arm
1718
- os: ubuntu-24.04-arm
19+
- os: ubuntu-26.04-arm
1820
runs-on: ${{ matrix.os }}
1921

2022
steps:
@@ -25,6 +27,16 @@ jobs:
2527
- name: Set TERM variable
2628
run: echo "TERM=xterm" >> $GITHUB_ENV
2729

30+
- name: Set up Dependency ubuntu26.04 Environment
31+
if: matrix.os == 'ubuntu-26.04'
32+
run: |
33+
latest_tag=$(curl -s -H "Authorization: Bearer ${{ github.token }}" https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
34+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_26.04_x86-64.zip
35+
unzip ./XEngine_UBuntu_26.04_x86-64.zip -d ./XEngine_UBuntu_26.04_x86-64
36+
cd XEngine_UBuntu_26.04_x86-64
37+
38+
chmod 777 *
39+
sudo ./XEngine_LINEnv.sh -i 3
2840
- name: Set up Dependency ubuntu24.04 Environment
2941
if: matrix.os == 'ubuntu-24.04'
3042
run: |
@@ -72,6 +84,19 @@ jobs:
7284
chmod 777 *
7385
sudo ./XEngine_LINEnv.sh -i 3
7486
87+
- name: Set up Dependency ubuntu26.04 arm64 Environment
88+
if: matrix.os == 'ubuntu-26.04-arm'
89+
env:
90+
GH_TOKEN: ${{ github.token }}
91+
run: |
92+
latest_tag=$(gh api repos/libxengine/libxengine/releases/latest --jq '.tag_name')
93+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_26.04_Arm64.zip
94+
unzip ./XEngine_UBuntu_26.04_Arm64.zip -d ./XEngine_UBuntu_26.04_Arm64
95+
cd XEngine_UBuntu_26.04_Arm64
96+
97+
chmod 777 *
98+
sudo ./XEngine_LINEnv.sh -i 3
99+
75100
- name: install library package
76101
run: |
77102
sudo apt install libluajit-5.1-dev -y

‎XEngine_Module/XEngine_AIApi/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

‎XEngine_Module/XEngine_InfoReport/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

‎XEngine_Module/XEngine_MSGNotify/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

‎XEngine_Module/XEngine_PluginExtension/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ else ifeq ($(PLATFORM), freebsd)
7171
LIBFLAG = -shared
7272
LIBEX = -lpthread -lrt -ldl
7373
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
74+
CC = clang++ -Wall -std=c++20 -fPIC
7475
else ifeq ($(PLATFORM), android)
7576
PLATVER = -D __ANDROID__
7677
FILEEXT = so

‎XEngine_Module/XEngine_Token/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

‎XEngine_Module/XEngine_Verification/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

‎XEngine_Module/jsoncpp/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -58,6 +58,7 @@ else ifeq ($(PLATFORM),mac)
5858
LIBEX = -lpthread -ldl
5959
LOADBIN = -Wl,-rpath,@loader_path/./
6060
else ifeq ($(PLATFORM), freebsd)
61+
CC = clang++ -Wall -std=c++20 -fPIC
6162
PLATVER = -D __FREEBSD__
6263
FILEEXT = so
6364
LIBFLAG = -shared

‎XEngine_Module/tinyxml2/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = g++ -Wall -std=c++17 -fPIC
1+
CC = g++ -Wall -std=c++20 -fPIC
22
PLATFORM = linux
33
PLATVER =
44
FILEEXT =
@@ -63,6 +63,7 @@ else ifeq ($(PLATFORM), freebsd)
6363
LIBFLAG = -shared
6464
LIBEX = -lpthread -lrt -ldl
6565
LOADBIN = -Wl,-rpath=./,--disable-new-dtags
66+
CC = clang++ -Wall -std=c++20 -fPIC
6667
else ifeq ($(PLATFORM), android)
6768
PLATVER = -D __ANDROID__
6869
FILEEXT = so

0 commit comments

Comments
 (0)