X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.h;h=c40bccd3bfde548e21efdf2d7b132c93e1eb835b;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=81c617e963a8862a8eecc770069ff82d46b80b57;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/sharedlibrary.h b/source/sharedlibrary.h
index 81c617e..c40bccd 100644
--- a/source/sharedlibrary.h
+++ b/source/sharedlibrary.h
@@ -2,24 +2,38 @@
 #define SHAREDLIB_H_
 
 #include "binary.h"
-#include "library.h"
+
+class ImportLibrary;
 
 /**
-Represents a shared library.  Mainly exists to give extra information to the
-user.
+Represents a shared library.  It has two special properties: libname and
+soname.  Libname is the name used by the linker.  Soname is the canonical
+filename of the library, including version number.  If the owning package has
+no version, soname will be empty.
+
+A SharedLibrary can also store a pointer to the associated ImportLibrary, for
+platforms that need one.
 */
-class SharedLibrary: public Binary, public Library
+class SharedLibrary: public Binary
 {
 private:
+	std::string libname;
 	std::string soname;
+	ImportLibrary *import_lib;
 
 public:
+	SharedLibrary(Builder &, const Msp::FS::Path &);
 	SharedLibrary(Builder &, const Component &, const std::list<ObjectFile *> &);
+private:
+	static std::string generate_filename(const Component &);
+
+public:
 	virtual const char *get_type() const { return "SharedLibrary"; }
+	const std::string &get_libname() const { return libname; }
 	const std::string &get_soname() const { return soname; }
 
-private:
-	std::string create_soname(const Component &);
+	void set_import_library(ImportLibrary *);
+	ImportLibrary *get_import_library() const { return import_lib; }
 };
 
 #endif