[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth src/filesystem.cpp ./configure.ac
From: |
ott |
Subject: |
[Wesnoth-cvs-commits] wesnoth src/filesystem.cpp ./configure.ac |
Date: |
Sun, 22 May 2005 19:37:43 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/05/22 23:37:43
Modified files:
src : filesystem.cpp
. : configure.ac
Log message:
New configure option --enable-internal-data for Mac OS X: keep data
inside the application (currently only affects translations). Also fix
commandline build which currently looks for translations inside a
nonexistent application bundle. To retain current behaviour on Mac OS X
add -DUSE_INTERNAL_DATA to compiler flags, eg. in Xcode project.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.147 wesnoth/configure.ac:1.148
--- wesnoth/configure.ac:1.147 Sun May 22 13:06:21 2005
+++ wesnoth/configure.ac Sun May 22 23:37:43 2005
@@ -37,7 +37,7 @@
EOF
])
-AC_REVISION([$Revision: 1.147 $])
+AC_REVISION([$Revision: 1.148 $])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -222,6 +222,12 @@
[dummylocales=$enableval],
[dummylocales=no])
+AC_ARG_ENABLE([internal-data],
+ AS_HELP_STRING([--enable-internal-data],
+ [put data inside application: Mac OS X only]),
+ [internaldata=$enableval],
+ [internaldata=no])
+
AM_CONDITIONAL([STATIC], [test x$static = xyes])
AM_CONDITIONAL([GAME], [test x$game = xyes])
AM_CONDITIONAL([SERVER], [test x$server = xyes])
@@ -238,6 +244,10 @@
AC_DEFINE([USE_DUMMYLOCALES],,[Define if the game should not use system
locales])
fi
+if test x$internaldata = xyes; then
+ AC_DEFINE([USE_INTERNAL_DATA],[],[Define if translations should be placed
inside app, for Mac OS X])
+fi
+
#######################################################################
# Checks for programs. #
#######################################################################
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.71 wesnoth/src/filesystem.cpp:1.72
--- wesnoth/src/filesystem.cpp:1.71 Sat May 7 15:40:38 2005
+++ wesnoth/src/filesystem.cpp Sun May 22 23:37:43 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.71 2005/05/07 15:40:38 silene Exp $ */
+/* $Id: filesystem.cpp,v 1.72 2005/05/22 23:37:43 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -263,15 +263,14 @@
return get_cwd() + "/po";
#endif
-#ifdef __APPLE__
- return get_cwd() + "/messages";
+#ifdef USE_INTERNAL_DATA
+ return get_cwd() + "/" LOCALEDIR;
#endif
- std::string res;
#if HAS_RELATIVE_LOCALEDIR
- res = game_config::path + "/" LOCALEDIR;
+ std::string res = game_config::path + "/" LOCALEDIR;
#else
- res = LOCALEDIR;
+ std::string res = LOCALEDIR;
#endif
return res;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth src/filesystem.cpp ./configure.ac,
ott <=