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
YGOPRO-520DIY
ygopro
Commits
87775390
Commit
87775390
authored
May 01, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update lua on osx
parent
935534a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
.travis.yml
.travis.yml
+4
-3
gframe/premake4.lua
gframe/premake4.lua
+1
-0
premake5.lua
premake5.lua
+3
-0
No files found.
.travis.yml
View file @
87775390
...
...
@@ -23,14 +23,15 @@ before_install:
-
git submodule update --init --recursive
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update;
brew install freetype libevent sqlite dylibbundler p7zip
lua
;
brew install freetype libevent sqlite dylibbundler p7zip;
sudo cp -r /usr/local/include/freetype2 ./freetype2;
sudo cp -r /usr/local/include/event2 ./event2;
sudo cp -r /usr/local/include/lua ./lua;
sudo rm -rf /usr/local/include/*;
sudo cp -r ./freetype2 /usr/local/include/freetype2;
sudo cp -r ./event2 /usr/local/include/event2;
sudo cp -r ./lua /usr/local/include/lua;
curl --retry 5 --location https://www.lua.org/ftp/lua-5.3.5.tar.gz | tar zfx -;
mv lua-5.3.5/src lua;
cp premake/lua/premake4.lua lua/;
fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir irrlicht ; cd irrlicht ; curl --retry 5 --location https://github.com/moecube/irrlicht/releases/download/test/irrlicht-mycard-mac.tar.gz | tar zfx - ; cp libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; cd .. ; fi
...
...
gframe/premake4.lua
View file @
87775390
...
...
@@ -61,6 +61,7 @@ project "ygopro"
end
configuration
"macosx"
includedirs
{
"/usr/include/irrlicht"
}
links
{
"lua"
}
if
USE_IRRKLANG
then
links
{
"irrklang"
}
libdirs
{
"../irrklang/bin/macosx-gcc"
}
...
...
premake5.lua
View file @
87775390
...
...
@@ -97,6 +97,9 @@ end
end
if
os
.
ishost
(
"linux"
)
then
include
"irrlicht_linux"
end
if
os
.
ishost
(
"macosx"
)
then
include
"lua"
end
if
USE_IRRKLANG
then
include
"ikpmp3"
...
...
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