diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index e1b7821cc..8d41536da 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -676,7 +676,7 @@ ifneq (0,$(STANDALONE)) COMPILERFLAGS+= -DEDUKE32_STANDALONE endif -COMPILERFLAGS+= -DAPPNAME=\"$(APPNAME)\" +COMPILERFLAGS+= -DAPPNAME=\"$(APPNAME)\" -DAPPBASENAME=\"$(APPBASENAME)\" # may be overridden EXESUFFIX= diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index f47296927..77b65deec 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -47,11 +47,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define APPNAME "EDuke32" #endif -#define HEAD2 APPNAME +#ifndef APPBASENAME + #define APPBASENAME "eduke32" +#endif -#define VOLUMEALL (g_Shareware == 0) -#define PLUTOPAK (g_scriptVersion >= 14) -#define VOLUMEONE (g_Shareware == 1) +#define HEAD2 APPNAME + +#ifdef EDUKE32_STANDALONE + #define VOLUMEALL (1) + #define PLUTOPAK (1) + #define VOLUMEONE (0) +#else + #define VOLUMEALL (g_Shareware == 0) + #define PLUTOPAK (g_scriptVersion >= 14) + #define VOLUMEONE (g_Shareware == 1) +#endif // increase by 3, because atomic GRP adds 1, and Shareware adds 2 #ifdef LUNATIC diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 6129d5869..cd3637c4f 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -6092,7 +6092,7 @@ int app_main(int argc, char const * const * argv) } else #endif - OSD_SetLogFile("eduke32.log"); + OSD_SetLogFile(APPBASENAME ".log"); OSD_SetFunctions(GAME_drawosdchar, GAME_drawosdstr, diff --git a/polymer/eduke32/source/gamedefs.h b/polymer/eduke32/source/gamedefs.h index 13d3ee54d..b8596e400 100644 --- a/polymer/eduke32/source/gamedefs.h +++ b/polymer/eduke32/source/gamedefs.h @@ -43,7 +43,7 @@ extern "C" { // // Setup program defines // -#define SETUPFILENAME "eduke32.cfg" +#define SETUPFILENAME APPBASENAME ".cfg" // Number of JOY buttons // KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c