Merge branch 'master' into server

appveyor.yml

@@ -8,7 +8,7 @@ install:
 
   # environment and system dependency
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-windows.zip ; exit 0"
-  - 7z x premake-5.0.0-alpha14-windows.zip
+  - 7z x -y premake-5.0.0-alpha14-windows.zip
   
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz ; exit 0"
   - tar xf libevent-2.0.22-stable.tar.gz
@@ -19,8 +19,8 @@ install:
   - tar xf lua-5.3.5.tar.gz
   - move lua-5.3.5\src lua
   
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/2020/sqlite-amalgamation-3310100.zip  ; exit 0"
-  - 7z x sqlite-amalgamation-3310100.zip
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/2018/sqlite-amalgamation-3310100.zip ; exit 0"
+  - 7z x -y sqlite-amalgamation-3310100.zip
   - move sqlite-amalgamation-3310100 sqlite3
   
   # let premake happy

premake/lua/premake4.lua

 project "lua"
     kind "StaticLib"
 
-    files { "*.c", "*.cpp", "*.h", "*.hpp" }
-    removefiles { "lua.c", "luac.c" }
+    files { "**.cc", "**.cpp", "**.c", "**.h" }
+    excludes { "lua.c", "luac.c" }
     
     configuration "vs*"
         buildoptions { "/TP" }
+    configuration "not vs*"
+        buildoptions { "-x c++" }

premake5.lua

@@ -14,11 +14,14 @@ end
         startproject "ygopro"
 
 if os.getenv("YGOPRO_USE_XP_TOOLSET") then
+    configuration { "windows", "vs2015" }
+        toolset "v140_xp"
+
     configuration { "windows", "vs2017" }
         toolset "v141_xp"
 
-    configuration { "windows", "not vs2017" }
-        toolset "v140_xp"
+    configuration { "windows", "vs2019" }
+        toolset "v141_xp"
 end
 
     configuration "bsd"
@@ -52,11 +55,15 @@ end
 if not os.ishost("macosx") then
         staticruntime "On"
 end
+<<<<<<< HEAD
         disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4305", "4828", "4800" }
 =======
         staticruntime "On"
         disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
 >>>>>>> c2bd783e73660d7357546b44aaf3a9dfe1dee030
+=======
+        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
+>>>>>>> master
 
     configuration { "Release", "not vs*" }
         symbols "On"
@@ -78,6 +85,7 @@ end
     configuration {"not vs*", "windows"}
         buildoptions { "-static-libgcc" }
 
+<<<<<<< HEAD
     startproject "ygopro"
 
     include "ocgcore"
@@ -87,3 +95,20 @@ end
     include "event"
     include "sqlite3"
     end
+=======
+    include "ocgcore"
+    include "gframe"
+    if os.ishost("windows") then
+        include "lua"
+		include "event"
+		include "freetype"
+		include "irrlicht"
+		include "sqlite3"
+	end
+	if os.ishost("linux") then
+		include "irrlicht_linux"
+	end
+	if USE_IRRKLANG then
+		include "ikpmp3"
+	end
+>>>>>>> master