From 57d61085e2f2132cfe8256a1a132e1823f020781 Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Thu, 5 Dec 2019 21:42:04 +0100 Subject: [PATCH] Replace version with brand for .conf file suffix --- configure.ac | 1 + src/misc/cross.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index baa154ad..e291acf8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ dnl Init. AC_INIT(dosbox,git) +AC_DEFINE([CONF_BRAND],["staging-git"],[Suffix of the .conf file.]) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(README) diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp index 49c20aa8..6ecba051 100644 --- a/src/misc/cross.cpp +++ b/src/misc/cross.cpp @@ -71,11 +71,11 @@ void Cross::GetPlatformConfigDir(std::string& in) { void Cross::GetPlatformConfigName(std::string& in) { #ifdef WIN32 -#define DEFAULT_CONFIG_FILE "dosbox-" VERSION ".conf" +#define DEFAULT_CONFIG_FILE "dosbox-" CONF_BRAND ".conf" #elif defined(MACOSX) -#define DEFAULT_CONFIG_FILE "DOSBox " VERSION " Preferences" +#define DEFAULT_CONFIG_FILE "DOSBox " CONF_BRAND " Preferences" #else /*linux freebsd*/ -#define DEFAULT_CONFIG_FILE "dosbox-" VERSION ".conf" +#define DEFAULT_CONFIG_FILE "dosbox-" CONF_BRAND ".conf" #endif in = DEFAULT_CONFIG_FILE; }