Разные правки

src/myx/base/config.cpp

@@ -2,4 +2,4 @@
 #error Define MYXLIB_BUILD_LIBRARIES to compile this file.
 #endif
 
-#include "config.hpp"
+#include <myx/base/config-inl.hpp>

src/myx/base/config.hpp

@@ -5,9 +5,20 @@
 
 #ifdef MYXLIB_BUILD_LIBRARIES
 #undef MYXLIB_HEADER_ONLY
+
+#if defined( _WIN32 ) && defined( MYXLIB_SHARED_LIB )
+#ifdef myxlib_EXPORTS
+#define MYXLIB_API __declspec( dllexport )
+#else
+#define MYXLIB_API __declspec( dllimport )
+#endif
+#else
+#define MYXLIB_API
+#endif
 #define MYXLIB_INLINE inline
 #else
 #define MYXLIB_HEADER_ONLY
+#define MYXLIB_API
 #define MYXLIB_INLINE inline
 #endif
 

src/myx/math/almost_equal_relative-inl.hpp

@@ -48,4 +48,4 @@ MYXLIB_INLINE bool almost_equal_relative( const double a, const double b,
 
 } // namespace myx
 
-#endif
+#endif // ifndef MYX_MATH_ALMOST_EQUAL_RELATIVE_INL_HPP_

src/myx/math/almost_equal_relative_and_abs-inl.hpp

@@ -62,4 +62,4 @@ MYXLIB_INLINE bool almost_equal_relative_and_abs( const double a, const double b
 
 } // namespace myx
 
-#endif
+#endif // ifndef MYX_MATH_ALMOST_EQUAL_RELATIVE_AND_ABS_INL_HPP_

src/myx/math/almost_equal_ulps-inl.hpp

@@ -90,4 +90,4 @@ MYXLIB_INLINE bool almost_equal_ulps( const double a, const double b,
 
 } // namespace myx
 
-#endif
+#endif // ifndef MYX_MATH_ALMOST_EQUAL_ULPS_INL_HPP_

src/myx/math/almost_equal_ulps_and_abs-inl.hpp

@@ -84,4 +84,4 @@ MYXLIB_INLINE bool almost_equal_ulps_and_abs( const double a, const double b,
 
 } // namespace myx
 
-#endif
+#endif // ifndef MYX_MATH_ALMOST_EQUAL_ULPS_INL_HPP_

src/myx/math/constants-inl.hpp

@@ -15,4 +15,4 @@ namespace math {
 
 } // namespace myx
 
-#endif
+#endif // ifndef MYX_MATH_CONSTANTS_INL_HPP_

src/myx/math/constants.hpp

@@ -12,7 +12,7 @@ namespace myx {
 
 namespace math {
 
-const auto ImpedanceOfFreeSpace = (M_PI * 119.9169832);
+const auto ImpedanceOfFreeSpace = ( M_PI * 119.9169832 );
 
 } // namespace math
 

src/myx/qt/CMakeLists.txt

@@ -3,10 +3,8 @@ set(TRGT qt)
 
 # cmake-format: off
 # Список файлов исходных текстов
-if(NOT MYXLIB_HEADER_ONLY)
 set(TRGT_cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp)
-endif()
 
 # Список заголовочных файлов (используется для установки)
 set(TRGT_hpp

src/myx/qt/translators-inl.hpp

@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <myx/base/config.hpp>
+
 #ifndef MYXLIB_HEADER_ONLY
 #include <myx/qt/translators.hpp>
 #endif
 
-#include <myx/base/config.hpp>
-
 #include <QCoreApplication>
 #include <QLibraryInfo>
 #include <QLocale>

src/myx/qt/translators.cpp

@@ -2,4 +2,4 @@
 #error Define MYXLIB_BUILD_LIBRARIES to compile this file.
 #endif
 
-#include <myx/qt/translators.hpp>
+#include <myx/qt/translators-inl.hpp>