diff options
Diffstat (limited to 'libformat/libformat')
| -rw-r--r-- | libformat/libformat/buildfile | 28 | ||||
| -rw-r--r-- | libformat/libformat/export.hxx | 9 | ||||
| -rw-r--r-- | libformat/libformat/version.hxx.in | 1 |
3 files changed, 19 insertions, 19 deletions
diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile index 04043df..814ee33 100644 --- a/libformat/libformat/buildfile +++ b/libformat/libformat/buildfile @@ -1,32 +1,26 @@ -int_libs = # Interface dependencies. -imp_libs = # Implementation dependencies. -#import imp_libs += libhello%lib{hello} +intf_libs = # Interface dependencies. +impl_libs = # Implementation dependencies. +#import xxxx_libs += libhello%lib{hello} -lib{format}: {hxx ixx txx cxx}{** -version} hxx{version} $imp_libs $int_libs +lib{format}: {hxx ixx txx cxx}{** -version} hxx{version} $impl_libs $intf_libs -# Include the generated version header into the distribution (so that we don't -# pick up an installed one) and don't remove it when cleaning in src (so that -# clean results in a state identical to distributed). -# hxx{version}: in{version} $src_root/manifest -{ - dist = true - clean = ($src_root != $out_root) -} + +hxx{export}@./: cxx.importable = false # Build options. # cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD +{hbmia obja}{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD +{hbmis objs}{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD # Export options. # lib{format}: { cxx.export.poptions = "-I$out_root" "-I$src_root" - cxx.export.libs = $int_libs + cxx.export.libs = $intf_libs } liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC @@ -37,9 +31,9 @@ libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED # for details on the version.* variable values. # if $version.pre_release - lib{format}: bin.lib.version = @"-$version.project_id" + lib{format}: bin.lib.version = "-$version.project_id" else - lib{format}: bin.lib.version = @"-$version.major.$version.minor" + lib{format}: bin.lib.version = "-$version.major.$version.minor" # Install into the libformat/ subdirectory of, say, /usr/include/ # recreating subdirectories. diff --git a/libformat/libformat/export.hxx b/libformat/libformat/export.hxx index 1691181..60d514f 100644 --- a/libformat/libformat/export.hxx +++ b/libformat/libformat/export.hxx @@ -27,8 +27,13 @@ #else // If none of the above macros are defined, then we assume we are being used // by some third-party build system that cannot/doesn't signal the library -// type. Note that this fallback works for both static and shared but in case -// of shared will be sub-optimal compared to having dllimport. +// type. Note that this fallback works for both static and shared libraries +// provided the library only exports functions (in other words, no global +// exported data) and for the shared case the result will be sub-optimal +// compared to having dllimport. If, however, your library does export data, +// then you will probably want to replace the fallback with the (commented +// out) error since it won't work for the shared case. // # define LIBFORMAT_SYMEXPORT // Using static or shared. +//# error define LIBFORMAT_STATIC or LIBFORMAT_SHARED preprocessor macro to signal libformat library type being linked #endif diff --git a/libformat/libformat/version.hxx.in b/libformat/libformat/version.hxx.in index 3a1dd1c..4f7f605 100644 --- a/libformat/libformat/version.hxx.in +++ b/libformat/libformat/version.hxx.in @@ -22,6 +22,7 @@ #define LIBFORMAT_VERSION $libformat.version.project_number$ULL #define LIBFORMAT_VERSION_STR "$libformat.version.project$" #define LIBFORMAT_VERSION_ID "$libformat.version.project_id$" +#define LIBFORMAT_VERSION_FULL "$libformat.version$" #define LIBFORMAT_VERSION_MAJOR $libformat.version.major$ #define LIBFORMAT_VERSION_MINOR $libformat.version.minor$ |