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
wyykak
ygopro
Commits
f8fe5d74
Commit
f8fe5d74
authored
Jun 12, 2021
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
irrklang vs2019 and new lib
parent
9ce80460
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
.travis.yml
.travis.yml
+1
-1
gframe/premake4.lua
gframe/premake4.lua
+4
-4
No files found.
.travis.yml
View file @
f8fe5d74
...
...
@@ -34,7 +34,7 @@ before_install:
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 - ; c
p libIrrlicht.a /usr/local/lib/ ; sudo cp -r include /usr/local/include/irrlicht ; c
d .. ; 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 - ; cd .. ; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz | tar zfx -;
...
...
gframe/premake4.lua
View file @
f8fe5d74
...
...
@@ -38,12 +38,12 @@ project "ygopro"
end
links
{
"opengl32"
,
"ws2_32"
,
"winmm"
,
"gdi32"
,
"kernel32"
,
"user32"
,
"imm32"
}
if
IRRKLANG_PRO
then
configuration
{
"windows"
,
"not vs2017"
}
configuration
{
"windows"
,
"not vs2017"
,
"not vs2019"
}
libdirs
{
"../irrklang/lib/Win32-visualStudio"
}
configuration
{
"windows"
,
"vs2017"
}
libdirs
{
"../irrklang/lib/Win32-vs2017"
}
configuration
{
"windows"
,
"vs2019"
}
libdirs
{
"../irrklang/lib/Win32-vs201
7
"
}
libdirs
{
"../irrklang/lib/Win32-vs201
9
"
}
end
configuration
{
"windows"
,
"not vs*"
}
includedirs
{
"/mingw/include/irrlicht"
,
"/mingw/include/freetype2"
}
...
...
@@ -67,8 +67,8 @@ project "ygopro"
libdirs
{
"../irrklang/bin/linux-gcc-64"
}
end
configuration
"macosx"
includedirs
{
"
/usr/include/irrlicht
"
}
li
nks
{
"lua
"
}
includedirs
{
"
../irrlicht/include
"
}
li
bdirs
{
"../irrlicht
"
}
if
USE_IRRKLANG
then
links
{
"irrklang"
}
libdirs
{
"../irrklang/bin/macosx-gcc"
}
...
...
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