Skip to content

Y
ygopro
Commit f409a805 authored by nanahira's avatar nanahira
Browse files
Options

fixci

parent 43f96a0a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
.gitlab-ci.yml
View file @ f409a805
...@@ -24,6 +24,7 @@ mat_common: ...@@ -24,6 +24,7 @@ mat_common:
artifacts: artifacts:
paths: paths:
- lua - lua
- sqlite3
mat_irrklang: mat_irrklang:
stage: prepare stage: prepare
...@@ -150,7 +151,7 @@ exec_linux: ...@@ -150,7 +151,7 @@ exec_linux:
- bin/ - bin/
- obj/ - obj/
script: script:
- apt update; apt -y install git build-essential libfreetype6-dev libsqlite3-dev libgl1-mesa-dev libglu-dev libxxf86vm-dev - apt update; apt -y install git build-essential libfreetype6-dev libgl1-mesa-dev libglu-dev libxxf86vm-dev
- git submodule update --init - git submodule update --init
- env YGOPRO_LINUX_ALL_STATIC_LIBEVENT_PATH=$PWD/libevent-stable ./premake5 gmake - env YGOPRO_LINUX_ALL_STATIC_LIBEVENT_PATH=$PWD/libevent-stable ./premake5 gmake
- cd build - cd build
...@@ -178,7 +179,7 @@ exec_macos: ...@@ -178,7 +179,7 @@ exec_macos:
- obj/ - obj/
script: script:
- git submodule update --init - git submodule update --init
- brew install freetype libevent sqlite dylibbundler - brew install freetype libevent dylibbundler
- sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/ - sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/
#- sudo cp -rf irrklang/include /usr/local/include/irrklang #- sudo cp -rf irrklang/include /usr/local/include/irrklang
- ./premake5 gmake --cc=clang - ./premake5 gmake --cc=clang
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment