Merge branch 'master' into patch-miniaudio

gframe/game.cpp

@@ -138,6 +138,7 @@ bool Game::Initialize() {
 			L"/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
 			L"/System/Library/Fonts/PingFang.ttc",
+			L"/System/Library/Fonts/STHeiti Medium.ttc",
 			L"./fonts/textFont.ttf",
 			L"./fonts/textFont.ttc",
 			L"./fonts/textFont.otf"
@@ -1342,14 +1343,6 @@ void Game::LoadConfig() {
 		} else if(!std::strcmp(strbuf, "errorlog")) {
 			unsigned int val = std::strtol(valbuf, nullptr, 10);
 			enable_log = val & 0xff;
-		} else if(!std::strcmp(strbuf, "textfont")) {
-			int textfontsize = 0;
-			if (std::sscanf(linebuf, "%63s = %959s %d", strbuf, valbuf, &textfontsize) != 3)
-				continue;
-			gameConf.textfontsize = textfontsize;
-			BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
-		} else if(!std::strcmp(strbuf, "numfont")) {
-			BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
 		} else if(!std::strcmp(strbuf, "serverport")) {
 			gameConf.serverport = std::strtol(valbuf, nullptr, 10);
 		} else if(!std::strcmp(strbuf, "lasthost")) {
@@ -1444,7 +1437,18 @@ void Game::LoadConfig() {
 			// options allowing multiple words
 			if (std::sscanf(linebuf, "%63s = %959[^\n]", strbuf, valbuf) != 2)
 				continue;
-			if (!std::strcmp(strbuf, "nickname")) {
+			if (!std::strcmp(strbuf, "textfont")) {
+				char* last_space = std::strrchr(valbuf, ' ');
+				if (last_space == nullptr)
+					continue;
+				int fontsize = std::strtol(last_space + 1, nullptr, 10);
+				if (fontsize > 0)
+					gameConf.textfontsize = fontsize;
+				*last_space = 0;
+				BufferIO::DecodeUTF8(valbuf, gameConf.textfont);
+			} else if (!std::strcmp(strbuf, "numfont")) {
+				BufferIO::DecodeUTF8(valbuf, gameConf.numfont);
+			} else if (!std::strcmp(strbuf, "nickname")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.nickname);
 			} else if (!std::strcmp(strbuf, "gamename")) {
 				BufferIO::DecodeUTF8(valbuf, gameConf.gamename);

gframe/premake5.lua

@@ -68,7 +68,6 @@ project "YGOPro"
     filter "system:windows"
         defines { "_IRR_WCHAR_FILESYSTEM" }
         files "ygopro.rc"
-        libdirs { "$(DXSDK_DIR)Lib/x86" }
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "irrKlang" }

lflist.conf

-#[2025.4][2024.12 TCG][2025.1][2024.10][2024.7][2024.4][2024.1][2023.10][2023.7][2023.4][2023.1][2022.10][2022.7][2022.4][2022.1][2021.10][2021.7][2021.4][2021.1][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2024.9 TCG][2024.4 TCG][2024.1 TCG][2023.9 TCG][2023.6 TCG][2023.2 TCG][2022.12 TCG][2022.10 TCG][2022.5 TCG][2022.2 TCG][2021.10 TCG][2021.7 TCG][2021.3 TCG][2020.12 TCG][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
+#[2025.4][2025.4 TCG][2025.1][2024.10][2024.7][2024.4][2024.1][2023.10][2023.7][2023.4][2023.1][2022.10][2022.7][2022.4][2022.1][2021.10][2021.7][2021.4][2021.1][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2024.12 TCG][2024.9 TCG][2024.4 TCG][2024.1 TCG][2023.9 TCG][2023.6 TCG][2023.2 TCG][2022.12 TCG][2022.10 TCG][2022.5 TCG][2022.2 TCG][2021.10 TCG][2021.7 TCG][2021.3 TCG][2020.12 TCG][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
 !2025.4
 #forbidden
 20292186 0 --アーティファクト－デスサイズ
@@ -186,7 +186,7 @@
 52947044 2 --フュージョン・デステニー
 92714517 2 --ビッグウェルカム・ラビュリンス
 
-!2024.12 TCG
+!2025.4 TCG
 #forbidden
 62320425 0 --Agido the Ancient Sentinel
 20292186 0 --Artifact Scythe
@@ -207,8 +207,6 @@
 25926710 0 --Kelbek the Ancient Vanguard
 57421866 0 --Level Eater
 34206604 0 --Magical Scientist
-21377582 0 --Master Peace, the True Dracoslaying King
-36521307 0 --Mathmech Circular
 23434538 0 --Maxx "C"
 96782886 0 --Mind Master
 23558733 0 --Phoenixian Cluster Amaryllis
@@ -228,7 +226,9 @@
 24094258 0 --Heavymetalfoes Electrumite
 59934749 0 --Isolde, Two Tales of the Noble Knights
 39064822 0 --Knightmare Goblin
+65330383 0 --Knightmare Gryphon
 03679218 0 --Knightmare Mermaid
+30342076 0 --Link Decoder
 85243784 0 --Linkross
 41999284 0 --Linkuriboh
 44097050 0 --Mecha Phantom Beast Auroradon
@@ -245,6 +245,8 @@
 03040496 0 --Chaos Ruler, the Chaotic Magical Dragon
 62242678 0 --Hot Red Dragon Archfiend King Calamity
 63101919 0 --Tempest Magician
+21044178 0 --Abyss Dweller
+00440556 0 --Bahamut Shark
 27552504 0 --Beatrice, Lady of the Eternal
 48626373 0 --Kashtira Arise-Heart
 34086406 0 --Lavalval Chain
@@ -260,7 +262,6 @@
 81122844 0 --Wind-Up Carrier Zenmaity
 85115440 0 --Zoodiac Broadbull
 48905153 0 --Zoodiac Drident
-07394770 0 --Brilliant Fusion
 69243953 0 --Butterfly Dagger - Elma
 57953380 0 --Card of Safe Return
 60682203 0 --Cold Wave
@@ -303,25 +304,23 @@
 08124921 1 --Right Leg of the Forbidden One
 06728559 1 --Archnemeses Protos
 76794549 1 --Astrograph Sorcerer
-61901281 1 --Black Dragon Collapserpent
+06637331 1 --Bystial Druiswurm
 33854624 1 --Bystial Magnamhut
 14536035 1 --Dark Grepher
+91800273 1 --Dimension Shifter
 33396948 1 --Exodia the Forbidden One
 63542003 1 --Keldo the Sacred Protector
+21377582 1 --Master Peace, the True Dracoslaying King
+36521307 1 --Mathmech Circular
 38572779 1 --Miscellaneousaurus
-33508719 1 --Morphing Jar
 99937011 1 --Mudora the Sword Oracle
 12958919 1 --Phantom Skyblaster
 38814750 1 --PSY-Framegear Gamma
-09674034 1 --Snake-Eye Ash
-90241276 1 --Snake-Eyes Poplar
 20663556 1 --Substitoad
 37961969 1 --Tearlaments Havnis
 74078255 1 --Tearlaments Merrli
 00572850 1 --Tearlaments Scheiren
 91810826 1 --Tenpai Dragon Chundra
-41165831 1 --Unchained Soul of Sharvara
-99234526 1 --White Dragon Wyverburster
 78872731 1 --Zoodiac Ratpier
 39512984 1 --Gem-Knight Master Diamond
 80453041 1 --Phantom of Yubel
@@ -333,7 +332,10 @@
 00581014 1 --Daigusto Emeral
 75433814 1 --Number 40: Gimmick Puppet of Strings
 69170557 1 --Number C40: Gimmick Puppet of Dark Strings
+34909328 1 --Ryzeal Detonator
+85106525 1 --Bonfire
 44362883 1 --Branded Fusion
+07394770 1 --Brilliant Fusion
 24224830 1 --Called by the Grave
 72892473 1 --Card Destruction
 59750328 1 --Card of Demise
@@ -341,6 +343,7 @@
 04031928 1 --Change of Heart
 99266988 1 --Chaos Space
 67616300 1 --Chicken Game
+65681983 1 --Crossout Designator
 15854426 1 --Divine Wind of Mist Valley
 13035077 1 --Dragonic Diagram
 95308449 1 --Final Countdown
@@ -368,6 +371,7 @@
 45986603 1 --Snatch Steal
 73628505 1 --Terraforming
 11110587 1 --That Grass Looks Greener
+25311006 1 --Triple Tactics Talent
 46060017 1 --Zoodiac Barrage
 58921041 1 --Anti-Spell Fragrance
 53334471 1 --Gozen Match
@@ -377,12 +381,19 @@
 82732705 1 --Skill Drain
 24207889 1 --There Can Be Only One
 #semi limit
-34124316 2 --Cyber Jar
-43694650 2 --Danger!? Jackalope?
-99745551 2 --Danger!? Tsuchinoko?
-40177746 2 --Eva
-17330916 2 --Performapal Monkeyboard
+61901281 2 --Black Dragon Collapserpent
+34022970 2 --Ext Ryzeal
+08633261 2 --Ice Ryzeal
+32061192 2 --Maliss <P> Dormouse
+69272449 2 --Maliss <P> White Rabbit
+33508719 2 --Morphing Jar
+09674034 2 --Snake-Eye Ash
+90241276 2 --Snake-Eyes Poplar
+35844557 2 --Sword Ryzeal
+41165831 2 --Unchained Soul of Sharvara
+99234526 2 --White Dragon Wyverburster
 14532163 2 --Lightning Storm
+68337209 2 --Maliss in Underground
 55584558 2 --Purrely Delicious Memory
 21347668 2 --Purrely Sleepy Memory
 92107604 2 --Runick Fountain
@@ -8132,6 +8143,207 @@
 53582587 2 --激流葬
 29401950 2 --奈落の落とし穴
 
+!2024.12 TCG
+#forbidden
+62320425 0 --Agido the Ancient Sentinel
+20292186 0 --Artifact Scythe
+73356503 0 --Barrier Statue of the Stormwinds
+09929398 0 --Blackwing - Gofu the Vague Shadow
+94689206 0 --Block Dragon
+69015963 0 --Cyber-Stein
+15341821 0 --Dandylion
+08903700 0 --Djinn Releaser of Rituals
+51858306 0 --Eclipse Wyvern
+55623480 0 --Fairy Tail - Snow
+78706415 0 --Fiber Jar
+93369354 0 --Fishborg Blaster
+55204071 0 --Gimmick Puppet Nightmare
+67441435 0 --Glow-Up Bulb
+75732622 0 --Grinder Golem
+41855169 0 --Jowgen the Spiritualist
+25926710 0 --Kelbek the Ancient Vanguard
+57421866 0 --Level Eater
+34206604 0 --Magical Scientist
+21377582 0 --Master Peace, the True Dracoslaying King
+36521307 0 --Mathmech Circular
+23434538 0 --Maxx "C"
+96782886 0 --Mind Master
+23558733 0 --Phoenixian Cluster Amaryllis
+01357146 0 --Ronintoadin
+91258852 0 --SPYRAL Master Plan
+88071625 0 --The Tyrant Neptune
+44910027 0 --Victory Dragon
+17412721 0 --Elder Entity Norden
+46640168 0 --Fiendsmith's Lacrima
+43387895 0 --Supreme King Dragon Starving Venom
+92731385 0 --Tearlaments Kitkallos
+04280258 0 --Apollousa, Bow of the Goddess
+50588353 0 --Crystron Halqifibrax
+98095162 0 --Curious, the Lightsworn Dominion
+59537380 0 --Guardragon Agarpain
+86148577 0 --Guardragon Elpy
+24094258 0 --Heavymetalfoes Electrumite
+59934749 0 --Isolde, Two Tales of the Noble Knights
+39064822 0 --Knightmare Goblin
+03679218 0 --Knightmare Mermaid
+85243784 0 --Linkross
+41999284 0 --Linkuriboh
+44097050 0 --Mecha Phantom Beast Auroradon
+25725326 0 --Prank-Kids Meow-Meow-Mu
+70369116 0 --Predaplant Verte Anaconda
+72330894 0 --Simorgh, Bird of Sovereignty
+27381364 0 --Spright Elf
+61665245 0 --Summon Sorceress
+33918636 0 --Superheavy Samurai Scarecrow
+22593417 0 --Topologic Gumblar Dragon
+83152482 0 --Union Carrier
+84815190 0 --Baronne de Fleur
+27548199 0 --Borreload Savage Dragon
+03040496 0 --Chaos Ruler, the Chaotic Magical Dragon
+62242678 0 --Hot Red Dragon Archfiend King Calamity
+63101919 0 --Tempest Magician
+27552504 0 --Beatrice, Lady of the Eternal
+48626373 0 --Kashtira Arise-Heart
+34086406 0 --Lavalval Chain
+04423206 0 --M-X-Saber Invoker
+54719828 0 --Number 16: Shock Master
+10389142 0 --Number 42: Galaxy Tomahawk
+63504681 0 --Number 86: Heroic Champion - Rhongomyniad
+95474755 0 --Number 89: Diablosis the Mind Hacker
+58820923 0 --Number 95: Galaxy-Eyes Dark Matter Dragon
+52653092 0 --Number S0: Utopic ZEXAL
+34945480 0 --Outer Entity Azathot
+88581108 0 --True King of All Calamities
+81122844 0 --Wind-Up Carrier Zenmaity
+85115440 0 --Zoodiac Broadbull
+48905153 0 --Zoodiac Drident
+07394770 0 --Brilliant Fusion
+69243953 0 --Butterfly Dagger - Elma
+57953380 0 --Card of Safe Return
+60682203 0 --Cold Wave
+17375316 0 --Confiscation
+44763025 0 --Delinquent Duo
+23557835 0 --Dimension Fusion
+42703248 0 --Giant Trunade
+79571449 0 --Graceful Charity
+19613556 0 --Heavy Storm
+35059553 0 --Kaiser Colosseum
+85602018 0 --Last Will
+34906152 0 --Mass Driver
+46411259 0 --Metamorphosis
+41482598 0 --Mirage of Nightmare
+76375976 0 --Mystic Mine
+89023486 0 --Original Sinful Spoils - Snake-Eye
+74191942 0 --Painful Choice
+55144522 0 --Pot of Greed
+70828912 0 --Premature Burial
+63789924 0 --Smoke Grenade of the Thief
+54447022 0 --Soul Charge
+42829885 0 --The Forceful Sentry
+43262273 0 --Appointer of the Red Lotus
+01041278 0 --Branded Expulsion
+61740673 0 --Imperial Order
+28566710 0 --Last Turn
+23002292 0 --Red Reboot
+27174286 0 --Return from the Different Dimension
+93016201 0 --Royal Oppression
+57585212 0 --Self-Destruct Button
+03280747 0 --Sixth Sense
+23516703 0 --Summon Limit
+64697231 0 --Trap Dustshoot
+80604091 0 --Ultimate Offering
+05851097 0 --Vanity's Emptiness
+#limit
+07902349 1 --Left Arm of the Forbidden One
+44519536 1 --Left Leg of the Forbidden One
+70903634 1 --Right Arm of the Forbidden One
+08124921 1 --Right Leg of the Forbidden One
+06728559 1 --Archnemeses Protos
+76794549 1 --Astrograph Sorcerer
+61901281 1 --Black Dragon Collapserpent
+33854624 1 --Bystial Magnamhut
+14536035 1 --Dark Grepher
+33396948 1 --Exodia the Forbidden One
+63542003 1 --Keldo the Sacred Protector
+38572779 1 --Miscellaneousaurus
+33508719 1 --Morphing Jar
+99937011 1 --Mudora the Sword Oracle
+12958919 1 --Phantom Skyblaster
+38814750 1 --PSY-Framegear Gamma
+09674034 1 --Snake-Eye Ash
+90241276 1 --Snake-Eyes Poplar
+20663556 1 --Substitoad
+37961969 1 --Tearlaments Havnis
+74078255 1 --Tearlaments Merrli
+00572850 1 --Tearlaments Scheiren
+91810826 1 --Tenpai Dragon Chundra
+41165831 1 --Unchained Soul of Sharvara
+99234526 1 --White Dragon Wyverburster
+78872731 1 --Zoodiac Ratpier
+39512984 1 --Gem-Knight Master Diamond
+80453041 1 --Phantom of Yubel
+73539069 1 --Striker Dragon
+93896655 1 --Sunavalon Dryas
+65563871 1 --Sunvine Healer
+74586817 1 --PSY-Framelord Omega
+90953320 1 --T.G. Hyper Librarian
+00581014 1 --Daigusto Emeral
+75433814 1 --Number 40: Gimmick Puppet of Strings
+69170557 1 --Number C40: Gimmick Puppet of Dark Strings
+44362883 1 --Branded Fusion
+24224830 1 --Called by the Grave
+72892473 1 --Card Destruction
+59750328 1 --Card of Demise
+91623717 1 --Chain Strike
+04031928 1 --Change of Heart
+99266988 1 --Chaos Space
+67616300 1 --Chicken Game
+15854426 1 --Divine Wind of Mist Valley
+13035077 1 --Dragonic Diagram
+95308449 1 --Final Countdown
+81439173 1 --Foolish Burial
+27970830 1 --Gateway of the Six
+75500286 1 --Gold Sarcophagus
+18144506 1 --Harpie's Feather Duster
+66957584 1 --Infernity Launcher
+01845204 1 --Instant Fusion
+93946239 1 --Into the Void
+71650854 1 --Magical Mid-Breaker Field
+43040603 1 --Monster Gate
+83764718 1 --Monster Reborn
+33782437 1 --One Day of Peace
+02295440 1 --One for One
+84211599 1 --Pot of Prosperity
+58577036 1 --Reasoning
+32807846 1 --Reinforcement of the Army
+66730191 1 --Sangen Kaimen
+30336082 1 --Sangen Summoning
+24940422 1 --Sekka's Light
+73468603 1 --Set Rotation
+52340444 1 --Sky Striker Mecha - Hornet Drones
+71344451 1 --Slash Draw
+45986603 1 --Snatch Steal
+73628505 1 --Terraforming
+11110587 1 --That Grass Looks Greener
+46060017 1 --Zoodiac Barrage
+58921041 1 --Anti-Spell Fragrance
+53334471 1 --Gozen Match
+32723153 1 --Magical Explosion
+03734202 1 --Naturia Sacred Tree
+90846359 1 --Rivalry of Warlords
+82732705 1 --Skill Drain
+24207889 1 --There Can Be Only One
+#semi limit
+34124316 2 --Cyber Jar
+43694650 2 --Danger!? Jackalope?
+99745551 2 --Danger!? Tsuchinoko?
+40177746 2 --Eva
+17330916 2 --Performapal Monkeyboard
+14532163 2 --Lightning Storm
+55584558 2 --Purrely Delicious Memory
+21347668 2 --Purrely Sleepy Memory
+92107604 2 --Runick Fountain
+
 !2024.9 TCG
 #forbidden
 62320425 0 --Agido the Ancient Sentinel

premake/event/premake5.lua

@@ -11,3 +11,4 @@ project "event"
     filter "system:windows"
         prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" }
         files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
+        defines { "WIN32" } -- quirk of old libevent

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" }
-

premake5.lua

@@ -214,7 +214,6 @@ workspace "YGOPro"
     configurations { "Release", "Debug" }
 
     filter "system:windows"
-        defines { "WIN32", "_WIN32" }
         entrypoint "mainCRTStartup"
         systemversion "latest"
         startproject "YGOPro"