valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Replace version with brand for .conf file suffix

Browse source
This commit is contained in:
Patryk Obara 2019-12-05 21:42:04 +01:00 • committed by Patryk Obara
parent 5d644b4f53
commit 57d61085e2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -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)

6
src/misc/cross.cpp
View file

@ -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;
}