Commit b79ef9b7 authored by nanahira's avatar nanahira

Merge branch 'patch-irrlicht-mac' of github.com:mercury233/ygopro into develop

parents 0196bc51 3aace69f
......@@ -6,8 +6,6 @@ TARGET_PLATFORM=$(arch)
TARGET_YGOPRO_BINARY_PATH=./ygopro-platforms/ygopro-platform-$TARGET_PLATFORM
export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
export EVENT_LIB_DIR=$PWD/libevent-stable/lib
export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
......
......@@ -401,12 +401,6 @@ jobs:
run: |
git clone --depth=1 https://github.com/mercury233/irrlicht
- name: Build irrlicht
run: |
cd irrlicht/source/Irrlicht/MacOSX
xcodebuild -project MacOSX.xcodeproj
cd ../../../..
- name: Copy premake files
run: |
cp -r premake/* .
......@@ -418,9 +412,7 @@ jobs:
./premake5 gmake \
--cc=clang \
--freetype-include-dir="/usr/local/include/freetype2" \
--opus-include-dir="/usr/local/include/opus" \
--irrlicht-include-dir="../irrlicht/include" \
--irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
--opus-include-dir="/usr/local/include/opus"
- name: Use premake to generate make files (ARM64)
if: runner.arch == 'ARM64'
......@@ -438,9 +430,7 @@ jobs:
--opus-include-dir="/opt/homebrew/include/opus" \
--opus-lib-dir="/opt/homebrew/lib" \
--vorbis-include-dir="/opt/homebrew/include" \
--vorbis-lib-dir="/opt/homebrew/lib" \
--irrlicht-include-dir="../irrlicht/include" \
--irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
--vorbis-lib-dir="/opt/homebrew/lib"
- name: Make
run: |
......
......@@ -22,6 +22,8 @@ mat_common:
# freetype
- wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx -
- mv freetype-2.11.1 freetype
# irrlicht
- ./.ci/prepare-irrlicht.sh
# miniaudio
- ./.ci/prepare-miniaudio.sh
# premake
......@@ -31,6 +33,7 @@ mat_common:
- lua
- freetype
- sqlite3
- irrlicht
- miniaudio
mat_submodules:
......@@ -53,11 +56,12 @@ mat_linux:
- linux
image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
script:
- apt update; apt -y install git wget tar
- ./.ci/prepare-irrlicht.sh
artifacts:
paths:
- irrlicht
- 'true'
#- apt update; apt -y install git wget tar
#- ./.ci/prepare-irrlicht.sh
#artifacts:
# paths:
# - irrlicht
mat_macos:
stage: prepare
......@@ -67,14 +71,9 @@ mat_macos:
- apt update; apt -y install wget tar
- wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
- chmod +x premake5
- mkdir irrlicht
- cd irrlicht
- wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
- cd ..
artifacts:
paths:
- premake5
- irrlicht
mat_windows:
stage: prepare
......@@ -88,13 +87,10 @@ mat_windows:
# event
- wget -O - https://cdn02.moecube.com:444/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
- mv libevent-2.0.22-stable event
# irrlicht
- ./.ci/prepare-irrlicht.sh
artifacts:
paths:
- premake5.exe
- event
- irrlicht
._exec_build:
stage: build
......@@ -130,7 +126,7 @@ exec_windows:
image: git-registry.moenext.com/mycard/docker-ygopro-builder
dependencies:
- mat_common
- mat_linux
#- mat_linux
- mat_submodules
variables:
EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
......@@ -143,7 +139,7 @@ exec_windows:
OGG_LIB_DIR: $CI_PROJECT_DIR/miniaudio/external-built/lib
script:
- ./.ci/build-opus.sh
- premake5 gmake --build-freetype --build-sqlite --build-irrlicht
- premake5 gmake --build-freetype --build-sqlite
- cd build
- make config=release -j$(nproc)
- cd ..
......
......@@ -158,3 +158,15 @@ project "irrlicht"
filter { "system:linux" }
links { "X11", "Xxf86vm" }
filter { "system:macosx" }
cppdialect "gnu++14"
defines { "GL_SILENCE_DEPRECATION", "PNG_ARM_NEON_OPT=0", "PNG_ARM_NEON_IMPLEMENTATION=0" }
undefines { "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_" }
files {
"source/Irrlicht/MacOSX/*.mm",
"source/Irrlicht/MacOSX/*.h",
}
filter { "system:macosx", "files:source/Irrlicht/Irrlicht.cpp or source/Irrlicht/COpenGLDriver.cpp" }
compileas "Objective-C++"
......@@ -6,7 +6,7 @@ LUA_LIB_NAME = "lua"
BUILD_EVENT = os.istarget("windows")
BUILD_FREETYPE = os.istarget("windows")
BUILD_SQLITE = os.istarget("windows")
BUILD_IRRLICHT = not os.istarget("macosx")
BUILD_IRRLICHT = true
USE_AUDIO = true
AUDIO_LIB = "miniaudio"
......@@ -365,7 +365,6 @@ workspace "YGOPro"
filter "system:macosx"
libdirs { "/usr/local/lib" }
buildoptions { "-stdlib=libc++" }
if MAC_ARM then
buildoptions { "--target=arm64-apple-macos12" }
end
......
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