diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-22 16:21:14 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-22 16:21:14 +0200 |
| commit | bac0750048650cc2d28b39461ef9d80f439ab94b (patch) | |
| tree | 09bf5dac81b899c76fd858815d8edca1d41437de | |
| parent | 4d79758a845d3cd64f0153d60abb88d3ae4c2a68 (diff) | |
Minor fixes and cleanups
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | butl/buildfile | 6 | ||||
| -rw-r--r-- | butl/export | 4 |
3 files changed, 11 insertions, 9 deletions
@@ -1,9 +1,13 @@ # Compiler/linker output. # -*.o *.d +*.o +*.obj *.so +*.dll *.a +*.lib +*.exp *.exe -*.dll -core +*.exe.dlls/ +*.exe.manifest diff --git a/butl/buildfile b/butl/buildfile index d4f3289..867f2c9 100644 --- a/butl/buildfile +++ b/butl/buildfile @@ -36,15 +36,13 @@ lib{butl}: file{sha256c.c} lib{butl}: file{strptime.c timelocal.h timelocal.c} cxx.poptions =+ -I$src_root +obja{*}: cxx.poptions += -DLIBBUTL_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBBUTL_SHARED_BUILD lib{butl}: cxx.export.poptions = -I$src_root - liba{butl}: cxx.export.poptions += -DLIBBUTL_STATIC libs{butl}: cxx.export.poptions += -DLIBBUTL_SHARED -obja{*}: cxx.poptions += -DLIBBUTL_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBBUTL_SHARED_BUILD - # Install into the butl/ subdirectory of, say, /usr/include/. # install.include = $install.include/butl diff --git a/butl/export b/butl/export index bd7f188..d2df06b 100644 --- a/butl/export +++ b/butl/export @@ -7,7 +7,7 @@ // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting -// classes that inherit from non-exported/import bases (e.g., std::string) +// classes that inherit from non-exported/imported bases (e.g., std::string) // will end up badly. The only known workarounds are to not inherit or to not // export. Also, MinGW GCC doesn't like seeing non-exported function being // used before their inline definition. The workaround is to reorder code. In @@ -30,7 +30,7 @@ # define LIBBUTL_EXPORT # endif #else -// If none of the above macros are defined, then we assume we are being using +// 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. |