From 68517b5732dd29d9fa35086f184b4bd3bc99b45b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 5 Sep 2012 20:08:12 +0300 Subject: [PATCH] Don't append library version to the end of the filename on Windows --- source/sharedlibrary.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp index 5fcbe74..b1ad358 100644 --- a/source/sharedlibrary.cpp +++ b/source/sharedlibrary.cpp @@ -32,7 +32,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list=2) break; - soname = format("%s.%s", FS::basename(path), version.substr(0, i)); + const Architecture &arch = builder.get_current_arch(); + const Pattern &pattern = arch.get_shared_library_patterns().front(); + if(arch.get_system()=="windows") + soname = pattern.apply(format("%s-%s", component->get_name(), version.substr(0, i))); + else + soname = format("%s.%s", pattern.apply(component->get_name()), version.substr(0, i)); + install_filename = soname; } } -- 2.43.0