From 732e50156ea4c77ef515c862e5bac4bb87da312c Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Sun, 26 Jan 2025 02:12:38 +0100 Subject: [PATCH 1/2] Is he stupid? (#16) --- src/w_wad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/w_wad.c b/src/w_wad.c index b94e39c7e..13d1ae785 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -891,7 +891,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup, wadco wadfile->compatmode = CheckCompatZip(numwadfiles - 1); break; default: - wadfile->compatmode = false; + wadfile->compatmode = CheckCompatFilename(filename); break; } From f7d2c496655c4cd87307aefee617232897858fc4 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 26 Jan 2025 21:35:47 +0000 Subject: [PATCH 2/2] Fix windows compile AGAIN I hate windows AAAAAAAAAAAA --- src/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bac6d4311..56c106590 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,10 +93,6 @@ target_link_libraries(SRB2SDL2 PRIVATE ZLIB::ZLIB PNG::PNG CURL::libcurl) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB -DHAVE_PNG -DHAVE_CURL -D_LARGEFILE64_SOURCE) target_sources(SRB2SDL2 PRIVATE apng.c) -target_link_libraries(SRB2SDL2 PRIVATE DiscordRPC::DiscordRPC) -target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_DISCORDRPC -DUSE_STUN) -target_sources(SRB2SDL2 PRIVATE discord.c stun.c) - target_link_libraries(SRB2SDL2 PRIVATE tcbrindle::span) target_link_libraries(SRB2SDL2 PRIVATE fmt::fmt-header-only) target_link_libraries(SRB2SDL2 PRIVATE Tracy::TracyClient)