59 lines
1.7 KiB
Plaintext
59 lines
1.7 KiB
Plaintext
From e4bd43d84f59bdb531ce6ced52978ecb2c784d60 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sat, 22 Apr 2017 10:23:26 +0200
|
|
Subject: No need to redefine scandir, fix gettext version mismatch
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c3af730..81aef5b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -23,7 +23,7 @@ AC_SUBST(NAME_VERSION)
|
|
# To link gettext library
|
|
AC_GNU_SOURCE
|
|
AM_GNU_GETTEXT
|
|
-AM_GNU_GETTEXT_VERSION([0.17])
|
|
+AM_GNU_GETTEXT_VERSION([0.19])
|
|
AM_GNU_GETTEXT_INTL_SUBDIR
|
|
|
|
# ----------------------------------------------------------------------
|
|
diff --git a/src/scandir.h b/src/scandir.h
|
|
index 3347cce..ef1cb6f 100644
|
|
--- a/src/scandir.h
|
|
+++ b/src/scandir.h
|
|
@@ -19,7 +19,7 @@
|
|
#define dirent direct
|
|
#endif
|
|
|
|
-#if defined(__BEOS__) || defined(__HAIKU__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
|
|
+#if defined(__BEOS__) || (defined(__sun) && defined(__SVR4)) || defined(WIN32)
|
|
extern int alphasort(const void *d1, const void *d2);
|
|
extern int scandir(const char *dirname, struct dirent ***namelist, int (*sdfilter)(struct dirent *), int (*dcomp)(const void *, const void *));
|
|
#endif
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From 2a2941bcc0b06c18d24718ee97b152112e9dec5f Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sat, 22 Apr 2017 13:38:50 +0200
|
|
Subject: disable fullscreen on start-up
|
|
|
|
|
|
diff --git a/src/globals.h b/src/globals.h
|
|
index 6b00214..0d19b48 100644
|
|
--- a/src/globals.h
|
|
+++ b/src/globals.h
|
|
@@ -107,7 +107,7 @@ typedef struct game_option_type{
|
|
#define GAME_FONT_SIZE 20
|
|
#define DEFAULT_LOCALE "en_US.UTF-8"
|
|
#define DEFAULT_USE_ENGLISH 1
|
|
-#define DEFAULT_FULLSCREEN 1
|
|
+#define DEFAULT_FULLSCREEN 0
|
|
#define DEFAULT_SYS_SOUND 1
|
|
#define DEFAULT_SFX_VOLUME 100
|
|
#define DEFAULT_MUS_VOLUME 100
|
|
--
|
|
2.7.0
|
|
|