summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2012-12-29 00:49:30 -0500
committerSocapex <philippe_groarke@yahoo.ca>2012-12-29 09:33:25 -0500
commita295ce54bbd7fcc0d4befd0bfaa2312aea9b602c (patch)
tree86ca33d6bc7fed6f628b535277a09784deb5c7ad
parent1ccaf38633d828e1a04a7d82e26334d236197057 (diff)
downloadmv-a295ce54bbd7fcc0d4befd0bfaa2312aea9b602c.tar.gz
mv-a295ce54bbd7fcc0d4befd0bfaa2312aea9b602c.tar.bz2
mv-a295ce54bbd7fcc0d4befd0bfaa2312aea9b602c.tar.xz
mv-a295ce54bbd7fcc0d4befd0bfaa2312aea9b602c.zip
Use physfs for locale folder on OS X.
-rw-r--r--Xcode/ManaPlus.xcodeproj/project.pbxproj10
-rw-r--r--src/client.cpp3
2 files changed, 7 insertions, 6 deletions
diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj
index f92d00555..4d2aa59d7 100644
--- a/Xcode/ManaPlus.xcodeproj/project.pbxproj
+++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj
@@ -1267,7 +1267,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 2B17132F1686A98C002E9493 /* ManaPlus10.6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManaPlus10.6.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 2B17132F1686A98C002E9493 /* ManaPlus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManaPlus.app; sourceTree = BUILT_PRODUCTS_DIR; };
2B1713311686A98C002E9493 /* ManaPlus-10.6-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "ManaPlus-10.6-Info.plist"; path = "/Volumes/User/philippe_groarke/Documents/XCode/socapexs-manaplus/Xcode/ManaPlus-10.6-Info.plist"; sourceTree = "<absolute>"; };
2B8B70C9167EBCB3003A8440 /* popuplist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popuplist.cpp; sourceTree = "<group>"; };
2B8B70CA167EBCB3003A8440 /* popuplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popuplist.h; sourceTree = "<group>"; };
@@ -2189,7 +2189,7 @@
children = (
2BDF45BF166D5AEC0054E77F /* ManaPlus.app */,
2BDF45E0166D5AEC0054E77F /* ManaPlusTests.octest */,
- 2B17132F1686A98C002E9493 /* ManaPlus10.6.app */,
+ 2B17132F1686A98C002E9493 /* ManaPlus.app */,
);
name = Products;
sourceTree = "<group>";
@@ -3251,7 +3251,7 @@
);
name = "ManaPlus 10.6";
productName = ManaPlus;
- productReference = 2B17132F1686A98C002E9493 /* ManaPlus10.6.app */;
+ productReference = 2B17132F1686A98C002E9493 /* ManaPlus.app */;
productType = "com.apple.product-type.application";
};
2BDF45BE166D5AEC0054E77F /* ManaPlus */ = {
@@ -4637,7 +4637,7 @@
"-DUSE_OPENGL",
);
OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a";
- PRODUCT_NAME = ManaPlus10.6;
+ PRODUCT_NAME = ManaPlus;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "i386 x86_64";
@@ -4685,7 +4685,7 @@
"-DUSE_OPENGL",
);
OTHER_LDFLAGS = "$(SRCROOT)/libs/libintl.a";
- PRODUCT_NAME = ManaPlus10.6;
+ PRODUCT_NAME = ManaPlus;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "i386 x86_64";
diff --git a/src/client.cpp b/src/client.cpp
index fe3723ef3..b7442a1bc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -350,7 +350,8 @@ void Client::gameInit()
#else
#ifdef __APPLE__
//TODO: Use physfs instead of absolute path.
- bindTextDomain("manaplus", "ManaPlus.app/Contents/Resources/locale/");
+ bindTextDomain("manaplus", (std::string(PHYSFS_getBaseDir())
+ + "ManaPlus.app/Contents/Resources/locale/").c_str());
#else
bindTextDomain("manaplus", LOCALEDIR);
#endif