Author: cazfi
Date: Fri Jul 29 10:09:23 2016
New Revision: 33368
URL: http://svn.gna.org/viewcvs/freeciv?rev=33368&view=rev
Log:
Consistently use '\' as directory separator in crosser based builds.
See bug #24884
Modified:
trunk/configure.ac
trunk/utility/shared.h
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=33368&r1=33367&r2=33368&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jul 29 10:09:23 2016
@@ -879,7 +879,6 @@
AS_HELP_STRING([--enable-crosser], [build version to be used with crosser
environment]),
[case "${enableval}" in
yes) crosser=yes
- HOST_DIR_SEPARATOR="/"
AC_DEFINE([CROSSER], [1], [this is crosser based build]) ;;
no) crosser=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-crosser]) ;;
Modified: trunk/utility/shared.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.h?rev=33368&r1=33367&r2=33368&view=diff
==============================================================================
--- trunk/utility/shared.h (original)
+++ trunk/utility/shared.h Fri Jul 29 10:09:23 2016
@@ -117,13 +117,7 @@
#endif
#endif /* PATH_SEPARATOR */
-#ifndef DIR_SEPARATOR
-#if defined(CROSSER)
- /* crosser based build */
-# define DIR_SEPARATOR_IS_DEFAULT
-# define DIR_SEPARATOR "/"
-# define DIR_SEPARATOR_CHAR '/'
-#elif defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
+#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
/* Win32, OS/2, DOS */
# define DIR_SEPARATOR "\\"
# define DIR_SEPARATOR_CHAR '\\'
@@ -133,7 +127,6 @@
# define DIR_SEPARATOR "/"
# define DIR_SEPARATOR_CHAR '/'
#endif
-#endif /* DIR_SEPARATOR */
#define PARENT_DIR_OPERATOR ".."
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
