aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2015-11-14 20:46:29 +0100
committerSteve Kondik <shade@chemlab.org>2015-11-14 20:49:30 +0100
commita8817acc592705abaa8ed4fd1bd6c3992d1cf2c4 (patch)
tree4ab09efca1dc149f205301625135f98afbe0feaf
parentaaeba81a9ca8ad78b13ba42a78849abdad6d4f45 (diff)
downloadandroid_external_p7zip-a8817acc592705abaa8ed4fd1bd6c3992d1cf2c4.tar.gz
android_external_p7zip-a8817acc592705abaa8ed4fd1bd6c3992d1cf2c4.tar.bz2
android_external_p7zip-a8817acc592705abaa8ed4fd1bd6c3992d1cf2c4.zip
Use a sane naming convention for the shared library
-rw-r--r--CPP/Windows/DLL.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/CPP/Windows/DLL.cpp b/CPP/Windows/DLL.cpp
index a40ab9e..16efb78 100644
--- a/CPP/Windows/DLL.cpp
+++ b/CPP/Windows/DLL.cpp
@@ -101,6 +101,14 @@ bool CLibrary::Load(LPCTSTR lpLibFileName)
strcpy(name+len-4,".so");
}
+#ifdef __ANDROID__
+ char tmp[MAX_PATHNAME_LEN+1];
+ if (strncmp(name, "./", 2) == 0) {
+ strcpy(tmp, name+2);
+ sprintf(name, "lib%s", tmp);
+ }
+#endif
+
TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))
#ifdef __APPLE_CC__