update irrlicht premake (#2755)

gframe/premake5.lua

@@ -53,7 +53,6 @@ project "YGOPro"
     filter "system:windows"
         defines { "_IRR_WCHAR_FILESYSTEM" }
         files "ygopro.rc"
-        libdirs { "$(DXSDK_DIR)Lib/x86" }
         if USE_IRRKLANG then
             links { "irrKlang" }
             if IRRKLANG_PRO then

premake/irrlicht/defines.lua

-defines {
-	"_IRR_STATIC_LIB_",
-	"NO_IRR_USE_NON_SYSTEM_BZLIB_",
-	"NO_IRR_COMPILE_WITH_BZIP2_",
-	"NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
-	"NO_IRR_COMPILE_WITH_DIRECT3D_8_",
-	"NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
-	"NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
-	"NO_IRR_COMPILE_WITH_SOFTWARE_",
-	"NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
-	"NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
-	"NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
-	"NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
-	"NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
-	"NO_IRR_COMPILE_WITH_MD2_LOADER_",
-	"NO_IRR_COMPILE_WITH_MD3_LOADER_",
-	"NO_IRR_COMPILE_WITH_3DS_LOADER_",
-	"NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
-	"NO_IRR_COMPILE_WITH_CSM_LOADER_",
-	"NO_IRR_COMPILE_WITH_BSP_LOADER_",
-	"NO_IRR_COMPILE_WITH_DMF_LOADER_",
-	"NO_IRR_COMPILE_WITH_LMTS_LOADER_",
-	"NO_IRR_COMPILE_WITH_MY3D_LOADER_",
-	"NO_IRR_COMPILE_WITH_OBJ_LOADER_",
-	"NO_IRR_COMPILE_WITH_OCT_LOADER_",
-	"NO_IRR_COMPILE_WITH_LWO_LOADER_",
-	"NO_IRR_COMPILE_WITH_STL_LOADER_",
-	"NO_IRR_COMPILE_WITH_PLY_LOADER_",
-	"NO_IRR_COMPILE_WITH_SMF_LOADER_",
-	"NO_IRR_COMPILE_WITH_IRR_WRITER_",
-	"NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
-	"NO_IRR_COMPILE_WITH_STL_WRITER_",
-	"NO_IRR_COMPILE_WITH_OBJ_WRITER_",
-	"NO_IRR_COMPILE_WITH_PLY_WRITER_",
-	"NO_IRR_COMPILE_WITH_PCX_LOADER_",
-	"NO_IRR_COMPILE_WITH_PPM_LOADER_",
-	"NO_IRR_COMPILE_WITH_PSD_LOADER_",
-	"NO_IRR_COMPILE_WITH_TGA_LOADER_",
-	"NO_IRR_COMPILE_WITH_WAL_LOADER_",
-	"NO_IRR_COMPILE_WITH_LMP_LOADER_",
-	"NO_IRR_COMPILE_WITH_RGB_LOADER_",
-	"NO_IRR_COMPILE_WITH_PCX_WRITER_",
-	"NO_IRR_COMPILE_WITH_PPM_WRITER_",
-	"NO_IRR_COMPILE_WITH_PSD_WRITER_",
-	"NO_IRR_COMPILE_WITH_TGA_WRITER_",
-	"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
-	"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
-	"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
-}

premake/irrlicht/premake5.lua

 project "irrlicht"
     kind "StaticLib"
 
-    includedirs { "include", "source/Irrlicht", "source/Irrlicht/jpeglib", "source/Irrlicht/libpng", "source/Irrlicht/zlib" }
+    includedirs {
+        "include",
+        "source/Irrlicht",
+        "source/Irrlicht/jpeglib",
+        "source/Irrlicht/libpng",
+        "source/Irrlicht/zlib"
+    }
 
-    dofile("defines.lua")
     exceptionhandling "Off"
     rtti "Off"
 
-    files { "include/*.h",
+    defines {
+        "_IRR_STATIC_LIB_",
+        "NO_IRR_USE_NON_SYSTEM_BZLIB_",
+        "NO_IRR_COMPILE_WITH_BZIP2_",
+        "NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
+        "NO_IRR_COMPILE_WITH_DIRECT3D_8_",
+        "NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
+        "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
+        "NO_IRR_COMPILE_WITH_SOFTWARE_",
+        "NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
+        "NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
+        "NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
+        "NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
+        "NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
+        "NO_IRR_COMPILE_WITH_MD2_LOADER_",
+        "NO_IRR_COMPILE_WITH_MD3_LOADER_",
+        "NO_IRR_COMPILE_WITH_3DS_LOADER_",
+        "NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
+        "NO_IRR_COMPILE_WITH_CSM_LOADER_",
+        "NO_IRR_COMPILE_WITH_BSP_LOADER_",
+        "NO_IRR_COMPILE_WITH_DMF_LOADER_",
+        "NO_IRR_COMPILE_WITH_LMTS_LOADER_",
+        "NO_IRR_COMPILE_WITH_MY3D_LOADER_",
+        "NO_IRR_COMPILE_WITH_OBJ_LOADER_",
+        "NO_IRR_COMPILE_WITH_OCT_LOADER_",
+        "NO_IRR_COMPILE_WITH_LWO_LOADER_",
+        "NO_IRR_COMPILE_WITH_STL_LOADER_",
+        "NO_IRR_COMPILE_WITH_PLY_LOADER_",
+        "NO_IRR_COMPILE_WITH_SMF_LOADER_",
+        "NO_IRR_COMPILE_WITH_IRR_WRITER_",
+        "NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
+        "NO_IRR_COMPILE_WITH_STL_WRITER_",
+        "NO_IRR_COMPILE_WITH_OBJ_WRITER_",
+        "NO_IRR_COMPILE_WITH_PLY_WRITER_",
+        "NO_IRR_COMPILE_WITH_PCX_LOADER_",
+        "NO_IRR_COMPILE_WITH_PPM_LOADER_",
+        "NO_IRR_COMPILE_WITH_PSD_LOADER_",
+        "NO_IRR_COMPILE_WITH_TGA_LOADER_",
+        "NO_IRR_COMPILE_WITH_WAL_LOADER_",
+        "NO_IRR_COMPILE_WITH_LMP_LOADER_",
+        "NO_IRR_COMPILE_WITH_RGB_LOADER_",
+        "NO_IRR_COMPILE_WITH_PCX_WRITER_",
+        "NO_IRR_COMPILE_WITH_PPM_WRITER_",
+        "NO_IRR_COMPILE_WITH_PSD_WRITER_",
+        "NO_IRR_COMPILE_WITH_TGA_WRITER_",
+        "NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
+        "NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
+        "NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
+        "NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_",
+        "PNG_INTEL_SSE",
+    }
+
+    files {
+        "include/*.h",
         "source/Irrlicht/*.cpp",
         "source/Irrlicht/lzma/*.h",
         "source/Irrlicht/lzma/*.c",
@@ -90,15 +148,13 @@ project "irrlicht"
         "source/Irrlicht/libpng/pngwrite.c",
         "source/Irrlicht/libpng/pngwtran.c",
         "source/Irrlicht/libpng/pngwutil.c",
-            "source/Irrlicht/aesGladman/*.h",
-            "source/Irrlicht/aesGladman/*.cpp" }
+        "source/Irrlicht/libpng/intel/intel_init.c",
+        "source/Irrlicht/libpng/intel/filter_sse2_intrinsics.c",
+    }
 
     filter { "system:windows" }
         defines { "_IRR_WCHAR_FILESYSTEM" }
         includedirs { "$(DXSDK_DIR)Include" }
-        libdirs { "$(DXSDK_DIR)Lib/x86" }
-        links { "imm32" }
 
     filter { "system:linux" }
         links { "X11", "Xxf86vm" }
-