Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MobiusMei
ygopro
Commits
307ad5df
Commit
307ad5df
authored
Aug 02, 2022
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use pure m1 for build
parent
0fdb0b97
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
44 deletions
+15
-44
.ci/exec-macos-platform.sh
.ci/exec-macos-platform.sh
+4
-1
.gitlab-ci.yml
.gitlab-ci.yml
+11
-43
No files found.
.ci/exec-macos-platform.sh
View file @
307ad5df
...
@@ -2,13 +2,16 @@
...
@@ -2,13 +2,16 @@
set
-x
set
-x
set
-o
errexit
set
-o
errexit
TARGET_PLATFORM
=
$(
arch
)
TARGET_YGOPRO_BINARY_PATH
=
./ygopro-platforms/ygopro-platform-
$TARGET_PLATFORM
TARGET_YGOPRO_BINARY_PATH
=
./ygopro-platforms/ygopro-platform-
$TARGET_PLATFORM
export
EVENT_INCLUDE_DIR
=
$PWD
/libevent-stable/include
export
EVENT_INCLUDE_DIR
=
$PWD
/libevent-stable/include
export
EVENT_LIB_DIR
=
$PWD
/libevent-stable/lib
export
EVENT_LIB_DIR
=
$PWD
/libevent-stable/lib
export
IRRLICHT_INCLUDE_DIR
=
$PWD
/irrlicht/include
export
IRRLICHT_INCLUDE_DIR
=
$PWD
/irrlicht/include
export
IRRLICHT_LIB_DIR
=
$PWD
/irrlicht
export
IRRLICHT_LIB_DIR
=
$PWD
/irrlicht
./premake5 gmake
--cc
=
clang
--build-freetype
--build-sqlite
./.ci/libevent-prebuild.sh
./premake5 gmake
--cc
=
clang
--build-freetype
--build-sqlite
--no-use-irrklang
cd
build
cd
build
make
config
=
release
-j4
make
config
=
release
-j4
...
...
.gitlab-ci.yml
View file @
307ad5df
...
@@ -73,28 +73,6 @@ mat_linux:
...
@@ -73,28 +73,6 @@ mat_linux:
-
irrlicht
-
irrlicht
-
libevent-stable
-
libevent-stable
mat_macos_platform_x86
:
stage
:
prepare
tags
:
-
macos
variables
:
PROCESSOR_COUNT
:
'
4'
script
:
./.ci/libevent-prebuild.sh
artifacts
:
paths
:
-
libevent-stable
mat_macos_platform_m1
:
stage
:
prepare
tags
:
-
linux
script
:
-
wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-m1mac.tar.gz | tar zfx -
artifacts
:
paths
:
-
libevent-stable
#mat_macos_irrklang_patched:
#mat_macos_irrklang_patched:
# stage: build
# stage: build
# tags:
# tags:
...
@@ -113,6 +91,7 @@ mat_macos:
...
@@ -113,6 +91,7 @@ mat_macos:
script
:
script
:
-
apt update; apt -y install wget tar
-
apt update; apt -y install wget tar
-
wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-macosx.tar.gz | tar zfx -
-
wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-macosx.tar.gz | tar zfx -
# - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
-
mkdir irrlicht
-
mkdir irrlicht
-
cd irrlicht
-
cd irrlicht
-
wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
-
wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
...
@@ -199,37 +178,26 @@ exec_linux:
...
@@ -199,37 +178,26 @@ exec_linux:
._exec_macos_platform
:
._exec_macos_platform
:
extends
:
._exec_build
extends
:
._exec_build
tags
:
dependencies
:
-
macos
-
mat_macos
-
mat_common
-
mat_submodules
script
:
script
:
-
./.ci/exec-macos-platform.sh
-
./.ci/exec-macos-platform.sh
variables
:
NO_USE_IRRKLANG
:
'
1'
artifacts
:
artifacts
:
paths
:
paths
:
-
ygopro-platforms
-
ygopro-platforms
exec_macos_platform_x86
:
exec_macos_platform_x86
:
extends
:
._exec_macos_platform
extends
:
._exec_macos_platform
dependencies
:
tags
:
#- mat_irrklang
-
macos
-
mat_macos
-
mat_common
-
mat_macos_platform_x86
-
mat_submodules
variables
:
TARGET_PLATFORM
:
x86
exec_macos_platform_m1
:
exec_macos_platform_m1
:
extends
:
._exec_macos_platform
extends
:
._exec_macos_platform
dependencies
:
tags
:
-
mat_macos
-
macos-m1
-
mat_common
-
mat_macos_platform_m1
-
mat_submodules
variables
:
TARGET_PLATFORM
:
m1
MAC_ARM
:
'
1'
exec_macos
:
exec_macos
:
stage
:
combine
stage
:
combine
...
@@ -241,7 +209,7 @@ exec_macos:
...
@@ -241,7 +209,7 @@ exec_macos:
#- mat_macos_irrklang_patched
#- mat_macos_irrklang_patched
script
:
script
:
-
mkdir -p ygopro.app/Contents/MacOS ygopro.app/Contents/Frameworks;
-
mkdir -p ygopro.app/Contents/MacOS ygopro.app/Contents/Frameworks;
-
lipo -create -output ygopro.app/Contents/MacOS/ygopro
ygopro-platforms/ygopro-platform-x86 ygopro-platforms/ygopro-platform-m1
;
-
lipo -create -output ygopro.app/Contents/MacOS/ygopro
$(ls -1 ygopro-platforms/ygopro-platform-*)
;
# do some special things for irrklang
# do some special things for irrklang
#- mv ./libirrklang-patched.dylib ygopro.app/Contents/Frameworks/libirrklang.dylib
#- mv ./libirrklang-patched.dylib ygopro.app/Contents/Frameworks/libirrklang.dylib
#- install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib ygopro.app/Contents/MacOS/ygopro
#- install_name_tool -change /usr/local/lib/libirrklang.dylib @executable_path/../Frameworks/libirrklang.dylib ygopro.app/Contents/MacOS/ygopro
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment