diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-04 21:57:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-04 21:57:32 +0300 |
| commit | 8a5603e487f682f5f67bc2cedae81249aa138f5b (patch) | |
| tree | 697535ca4d8e50ee6da8cf364cad814fa5f7603a /src/utils/physfstools.cpp | |
| parent | 80f7177ea4ce0185e1ef3355e91dcf14617d0f09 (diff) | |
| parent | f2d1d2b43a0ebdb625aea94cb4b8ff7fce6bf8f4 (diff) | |
| download | plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.gz plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.bz2 plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.tar.xz plus-8a5603e487f682f5f67bc2cedae81249aa138f5b.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/utils/physfstools.cpp')
| -rw-r--r-- | src/utils/physfstools.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/utils/physfstools.cpp b/src/utils/physfstools.cpp index 325f7cddc..8e04aa608 100644 --- a/src/utils/physfstools.cpp +++ b/src/utils/physfstools.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2013 The ManaPlus Developers + * Copyright (C) 2013-2014 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -33,13 +33,17 @@ const char *dirSeparator = nullptr; namespace PhysFs { +#if defined(__native_client__) void init(const char *const name) { -#if defined(__native_client__) if (!PHYSFS_init("/fakebinary")) #elif defined(ANDROID) + void init(const char *const name A_UNUSED) + { if (!PHYSFS_init((getRealPath(".").append("/fakebinary")).c_str())) #else + void init(const char *const name) + { if (!PHYSFS_init(name)) #endif { |