Merge branch 'irrlicht_linux'

.gitignore

@@ -13,7 +13,7 @@
 /freetype
 /sqlite3
 /irrklang
-/irrlicht
+/irrlicht*
 
 # gframe additionals
 /gframe/ygopro.ico

.travis.yml

@@ -13,7 +13,6 @@ addons:
       - libfreetype6-dev
       - libevent-dev
       - libsqlite3-dev
-      - libirrlicht-dev
       - libgl1-mesa-dev
       - libglu-dev
       - p7zip-full
@@ -30,6 +29,7 @@ before_install:
     curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-macosx.tar.gz | tar zfx -;
   fi
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    git clone https://github.com/DailyShana/irrlicht irrlicht_linux;
     curl --location --retry 5 https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -;
   fi
 

gframe/premake4.lua

@@ -33,16 +33,19 @@ project "ygopro"
     configuration "not vs*"
         buildoptions { "-std=c++14", "-fno-rtti" }
     configuration "not windows"
-        includedirs { "/usr/include/irrlicht", "/usr/include/freetype2" }
+        includedirs { "/usr/include/freetype2" }
         excludes { "COSOperator.*" }
         links { "event_pthreads", "GL", "dl", "pthread" }
     configuration "linux"
+        includedirs { "../irrlicht_linux/include" }
+        links { "X11", "Xxf86vm" }
         if USE_IRRKLANG then
             links { "IrrKlang" }
             linkoptions{ "-Wl,-rpath=./" }
             libdirs { "../irrklang/bin/linux-gcc-64" }
         end
     configuration "macosx"
+        includedirs { "/usr/include/irrlicht" }
         if USE_IRRKLANG then
             links { "irrklang" }
             libdirs { "../irrklang/bin/macosx-gcc" }

premake5.lua

@@ -77,6 +77,9 @@ solution "ygo"
 		include "irrlicht"
 		include "sqlite3"
 	end
+	if os.ishost("linux") then
+		include "irrlicht_linux"
+	end
 	if USE_IRRKLANG then
 		include "ikpmp3"
 	end