Skip to content

Commit eeb1f1e

Browse files
committed
update:make and workflows
1 parent d9c00e4 commit eeb1f1e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/macbuild.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
sudo mkdir -p /usr/local/include
6565
sudo mkdir -p /usr/local/lib
6666
sudo cp -rf ./XEngine_Include /usr/local/include
67-
sudo find ./XEngine_Mac -name "*.dylib" -exec cp {} /usr/local/lib \;
67+
sudo find ./XEngine_Mac -name "*.dylib" -exec cp {} /usr/local/lib \;
68+
ls -l /opt/homebrew/opt/
6869
#编译
6970
- name: make debug
7071
run: |

.github/workflows/ubuntubuild.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ jobs:
4242
git submodule update
4343
4444
- name: install library
45-
run: sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev
45+
run: |
46+
sudo apt update -y
47+
sudo apt upgrade -y
48+
sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev -y
4649
4750
# 设置依赖库的环境变量
4851
- name: Set up Dependency ubuntu24.04 Environment

XEngine_Source/XEngine_ModuleHelp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ else ifeq ($(PLATFORM),mac)
5858
PLATVER = -D __MACOS__
5959
PLATDIR = XEngine_Mac
6060
FILEEXT = dylib
61+
LOADHDR += -I /opt/homebrew/opt/opencv4/include -I /opt/homebrew/opt/lua/include
62+
LOADSO += -L /opt/homebrew/opt/opencv4/lib -L /opt/homebrew/opt/lua/lib
6163
LIBFLAG = -dynamiclib
6264
LIBEX = -lpthread -ldl
6365
LOADBIN = -Wl,-rpath,@loader_path/./

0 commit comments

Comments
 (0)