Add APPBASENAME to Makefile.common, controlling the resulting binary's default .cfg file name and .log file name. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@6010 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-01-18 22:21:16 +00:00
parent 0c5d9f8cbe
commit bc13f9dd39
4 changed files with 17 additions and 7 deletions

View file

@ -676,7 +676,7 @@ ifneq (0,$(STANDALONE))
COMPILERFLAGS+= -DEDUKE32_STANDALONE COMPILERFLAGS+= -DEDUKE32_STANDALONE
endif endif
COMPILERFLAGS+= -DAPPNAME=\"$(APPNAME)\" COMPILERFLAGS+= -DAPPNAME=\"$(APPNAME)\" -DAPPBASENAME=\"$(APPBASENAME)\"
# may be overridden # may be overridden
EXESUFFIX= EXESUFFIX=

View file

@ -47,11 +47,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define APPNAME "EDuke32" #define APPNAME "EDuke32"
#endif #endif
#define HEAD2 APPNAME #ifndef APPBASENAME
#define APPBASENAME "eduke32"
#endif
#define VOLUMEALL (g_Shareware == 0) #define HEAD2 APPNAME
#define PLUTOPAK (g_scriptVersion >= 14)
#define VOLUMEONE (g_Shareware == 1) #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 // increase by 3, because atomic GRP adds 1, and Shareware adds 2
#ifdef LUNATIC #ifdef LUNATIC

View file

@ -6092,7 +6092,7 @@ int app_main(int argc, char const * const * argv)
} }
else else
#endif #endif
OSD_SetLogFile("eduke32.log"); OSD_SetLogFile(APPBASENAME ".log");
OSD_SetFunctions(GAME_drawosdchar, OSD_SetFunctions(GAME_drawosdchar,
GAME_drawosdstr, GAME_drawosdstr,

View file

@ -43,7 +43,7 @@ extern "C" {
// //
// Setup program defines // Setup program defines
// //
#define SETUPFILENAME "eduke32.cfg" #define SETUPFILENAME APPBASENAME ".cfg"
// Number of JOY buttons // Number of JOY buttons
// KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c // KEEPINSYNC source/jmact/_control.h, build/src/sdlayer.c