diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 28f48cdad..c763ab3b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -257,6 +257,9 @@ set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL "Enable hardware renderer (OpenGL) FBO downsampling support") +set(SRB2_CONFIG_PHOBOS ON CACHE BOOL + " Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.") + if(${SRB2_CONFIG_DEDICATED}) set(SRB2_CONFIG_HAVE_GME NO) set(SRB2_CONFIG_HAVE_OPENMPT NO) @@ -583,6 +586,10 @@ if(${SRB2_CONFIG_SATURNJOIN}) add_definitions(-DDOSATURNJOIN) endif() +if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO}) + add_definitions(-DPHOBOS_BUILD) +endif() + # Targets # Compatibility flag with later versions of GCC diff --git a/src/Makefile b/src/Makefile index 5b1f9f0fa..27831946a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -65,6 +65,10 @@ # DEBUGMODE=1 - Enable various debugging capabilities. # Also disables optimizations. # +# PHOBOS_BUILD=1 - Compile the Phobos client. +# Contains things not compatible with vanilla. +# such as raised skinlimits, 32 player support, bugfixes, etc. +# # Development flags: # # VALGRIND=1 - Enable Valgrind memory debugging support. diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index af67a5494..6a63c9972 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -9,6 +9,7 @@ passthru_opts+=\ HAVE_DISCORDRPC DEVELOP\ NOHOLEPUNCH\ HAVE_IPV6\ + PHOBOS_BUILD\ # build with debugging information ifdef DEBUGMODE diff --git a/src/doomdef.h b/src/doomdef.h index 269e9a416..8b205cf51 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -611,16 +611,12 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; // None of these that are disabled in the normal build are guaranteed to work perfectly // Compile them at your own risk! -// TODO: make this a compile flag! -// define to enable fixes and features that are not vanilla compatible -//#define PHOBOS_BUILD - #ifdef PHOBOS_BUILD -// compiler cries otherwise :chaosleep: -#undef MAXPLAYERS // we want 32 players yesss +#undef MAXPLAYERS #define MAXPLAYERS 32 + // overwrite some of those // when not compiling in vanilla compat mode #define SATURNJOIN