子库改成静态库链接，最终生成单一二进制文件。

Author: taynpg

box_calendar/CMakeLists.txt

@@ -3,11 +3,15 @@ cmake_minimum_required(VERSION 3.8)
 project(box_calendar LANGUAGES CXX)
 
 include_directories(${CMAKE_SOURCE_DIR}/3rd/sxtwl_cpp/src)
-add_library(box_calendar SHARED 
-    "calendar_v1.h" "calendar_v1.cpp" 
-    "calendar_v1_data.h" "calendar_v1_data.cpp" 
-    "calendar_base.h" "calendar_base.cpp"
-    "calendar_v2.h" "calendar_v2.cpp"
+add_library(box_calendar STATIC 
+    "calendar_v1.h" 
+    "calendar_v1.cpp" 
+    "calendar_v1_data.h" 
+    "calendar_v1_data.cpp" 
+    "calendar_base.h" 
+    "calendar_base.cpp"
+    "calendar_v2.h" 
+    "calendar_v2.cpp"
 )
 target_link_libraries(box_calendar PRIVATE sxtwl)
 target_compile_definitions(box_calendar PRIVATE CPP_CALENDAR_LIB)

box_calendar/calendar_base.cpp

@@ -11,25 +11,29 @@
 
 namespace cppbox {
 
-bool CDate::operator==(const CDate& rh) const {
+bool CDate::operator==(const CDate& rh) const
+{
     if (m_nYear == rh.m_nYear && m_nMon == rh.m_nMon && m_nDay == rh.m_nDay) {
         return true;
     }
     return false;
 }
 
 CDate::CDate() = default;
-CDate::CDate(const CDate& date) {
+CDate::CDate(const CDate& date)
+{
     m_nYear = date.m_nYear;
     m_nMon = date.m_nMon;
     m_nDay = date.m_nDay;
 }
-CDate::CDate(int y, int m, int d) {
+CDate::CDate(int y, int m, int d)
+{
     m_nYear = y;
     m_nMon = m;
     m_nDay = d;
 }
-CDate& CDate::operator=(const CDate& date) {
+CDate& CDate::operator=(const CDate& date)
+{
     if (this == &date) {
         return *this;
     }
@@ -39,7 +43,8 @@ CDate& CDate::operator=(const CDate& date) {
     return *this;
 }
 
-CDateTime::CDateTime(const CDate& rh) {
+CDateTime::CDateTime(const CDate& rh)
+{
     m_date.m_nYear = rh.m_nYear;
     m_date.m_nMon = rh.m_nMon;
     m_date.m_nDay = rh.m_nDay;
@@ -48,7 +53,8 @@ CDateTime::CDateTime(const CDate& rh) {
     m_time.m_nSec = 0;
 }
 
-CDateTime::CDateTime(int y, int m, int d, int h, int min, int sec) {
+CDateTime::CDateTime(int y, int m, int d, int h, int min, int sec)
+{
     m_date.m_nYear = y;
     m_date.m_nMon = m;
     m_date.m_nDay = d;
@@ -57,7 +63,8 @@ CDateTime::CDateTime(int y, int m, int d, int h, int min, int sec) {
     m_time.m_nSec = sec;
 }
 
-CDateTime& CDateTime::operator=(const CDateTime& datetime) {
+CDateTime& CDateTime::operator=(const CDateTime& datetime)
+{
     if (this == &datetime) {
         return *this;
     }
@@ -78,28 +85,27 @@ CDateTime& CDateTime::operator=(const CDate& date)
     return *this;
 }
 
-CCalenderBase* CCalenderFactory::creatInstance(CalendarType etype) {
+CCalenderBase* CCalenderFactory::creatInstance(CalendarType etype)
+{
     CCalenderBase* pResult = nullptr;
 
     switch (etype) {
-        case CALENDAR_V1: {
-            pResult = new CCalenderV1();
-            break;
-        }
-        case CALENDAR_V2: {
-            pResult = new CCalenderV2();
-            break;
-        }
-        default:
-            break;
+    case CALENDAR_V1: {
+        pResult = new CCalenderV1();
+        break;
+    }
+    case CALENDAR_V2: {
+        pResult = new CCalenderV2();
+        break;
+    }
+    default:
+        break;
     }
     return pResult;
 }
 
 // 释放内存
-void CCalenderFactory::freeCalender(CCalenderBase* pCalender) {
-    delete pCalender;
-}
+void CCalenderFactory::freeCalender(CCalenderBase* pCalender) { delete pCalender; }
 
 CCalenderBase::CCalenderBase() = default;
 
@@ -108,7 +114,8 @@ CDateTime const& CCalenderBase::getDateTime() const { return m_datetime; }
 CDateTime const& CCalenderBase::getLunarDateTime() const { return m_ldatetime; }
 #ifdef _WIN32
 // 获取系统时间
-void CCalenderBase::getNowDateTime(CDateTime& datetime) {
+void CCalenderBase::getNowDateTime(CDateTime& datetime)
+{
     SYSTEMTIME nowTime;
     GetLocalTime(&nowTime);
     datetime.m_date.m_nYear = nowTime.wYear;
@@ -120,7 +127,8 @@ void CCalenderBase::getNowDateTime(CDateTime& datetime) {
 }
 #else
 // 获取系统时间
-void CCalenderBase::getNowDateTime(CDateTime& datetime) {
+void CCalenderBase::getNowDateTime(CDateTime& datetime)
+{
     struct std::tm* nowTime = nullptr;
     std::time_t     _otime_t;
     std::time(&_otime_t);
@@ -201,7 +209,8 @@ bool CCalenderBase::isLeapYear(int year)
 }
 
 // 求余数(结果大于0)
-int CCalenderBase::getRemainder(int nBase, int nValue) {
+int CCalenderBase::getRemainder(int nBase, int nValue)
+{
     int nRet = nValue % nBase;
     if (nRet < 0) {
         nRet += nBase;
@@ -210,7 +219,8 @@ int CCalenderBase::getRemainder(int nBase, int nValue) {
 }
 
 // 复制日期
-void CCalenderBase::copyDateTime(const CDateTime& datetime, CDateTime& outtime) {
+void CCalenderBase::copyDateTime(const CDateTime& datetime, CDateTime& outtime)
+{
     outtime.m_date.m_nYear = datetime.m_date.m_nYear;
     outtime.m_date.m_nMon = datetime.m_date.m_nMon;
     outtime.m_date.m_nDay = datetime.m_date.m_nDay;
@@ -219,7 +229,6 @@ void CCalenderBase::copyDateTime(const CDateTime& datetime, CDateTime& outtime)
     outtime.m_time.m_nSec = datetime.m_time.m_nSec;
 }
 
-
 // 获取四柱
 CGanZhi const& CCalenderBase::getSizhu() const { return m_sizhu; }
 
@@ -228,7 +237,8 @@ CJieQi const& CCalenderBase::getJieFirst() const { return m_first; }
 // 获取第二个节气
 CJieQi const& CCalenderBase::getJieSecond() const { return m_second; }
 
-CGanZhi& CGanZhi::operator=(const CGanZhi& ganzhi) {
+CGanZhi& CGanZhi::operator=(const CGanZhi& ganzhi)
+{
     if (this == &ganzhi) {
         return *this;
     }
@@ -242,4 +252,4 @@ CGanZhi& CGanZhi::operator=(const CGanZhi& ganzhi) {
     this->m_nYZhi = ganzhi.m_nYZhi;
     return *this;
 }
-}  // namespace cppbox
+}   // namespace cppbox

box_calendar/calendar_base.h

@@ -1,18 +1,25 @@
 #ifndef BOX_CALENDAR_BASE_H
 #define BOX_CALENDAR_BASE_H
 
-#if defined(_MSC_VER)
-#define CPP_CALENDAR_EXPORT __declspec(dllexport)
-#define CPP_CALENDAR_IMPORT __declspec(dllimport)
+#if defined (DYNAMIC_DLL)
+    #if defined(_MSC_VER)
+    #define CPP_CALENDAR_EXPORT __declspec(dllexport)
+    #define CPP_CALENDAR_IMPORT __declspec(dllimport)
+    #else
+    #define CPP_CALENDAR_EXPORT __attribute__((visibility("default")))
+    #define CPP_CALENDAR_IMPORT __attribute__((visibility("default")))
+    #endif
+
+    #ifdef CPP_CALENDAR_LIB
+    #define CPP_CALENDAR_API CPP_CALENDAR_EXPORT
+    #else
+    #define CPP_CALENDAR_API CPP_CALENDAR_IMPORT
+    #endif
 #else
-#define CPP_CALENDAR_EXPORT __attribute__((visibility("default")))
-#define CPP_CALENDAR_IMPORT __attribute__((visibility("default")))
-#endif
-
-#ifdef CPP_CALENDAR_LIB
-#define CPP_CALENDAR_API CPP_CALENDAR_EXPORT
-#else
-#define CPP_CALENDAR_API CPP_CALENDAR_IMPORT
+    #define CPP_CALENDAR_API
+    #if defined(_MSC_VER)
+        #pragma warning(disable: 4251)
+    #endif
 #endif
 
 namespace cppbox {
@@ -21,12 +28,12 @@ namespace cppbox {
 enum CalendarType {
     // 日历实现类的第一个版本，基于查表实现的日历，有效范围(1901 ~ 2099)
     CALENDAR_V1 = 0,
-    CALENDAR_V2  // 日历实现类的第二个版本，基于天文历算法实现的日历，有效范围(公元前722年
-                 // ~ 9999)
+    CALENDAR_V2   // 日历实现类的第二个版本，基于天文历算法实现的日历，有效范围(公元前722年
+                  // ~ 9999)
 };
 
 // 四柱
-struct CPP_CALENDAR_API CGanZhi {
+struct CGanZhi {
     CGanZhi& operator=(const CGanZhi& ganzhi);
     int      m_nYGan = -1;
     int      m_nYZhi = -1;
@@ -76,7 +83,8 @@ struct CPP_CALENDAR_API CJieQi {
 };
 
 // 日历处理基类
-class CPP_CALENDAR_API CCalenderBase {
+class CPP_CALENDAR_API CCalenderBase
+{
 public:
     CCalenderBase();
     virtual ~CCalenderBase() = default;
@@ -106,8 +114,7 @@ class CPP_CALENDAR_API CCalenderBase {
     // 返回两个日期之间的天数差
     virtual int getDiffByTwoDate(const CDate& dateA, const CDate& dateB) = 0;
     // 基于基础时间和差值计算新的日期
-    virtual void getDateTimeBySecond(const CDateTime& basetime,
-                                    CDateTime& outtime, long long nSecond) = 0;
+    virtual void getDateTimeBySecond(const CDateTime& basetime, CDateTime& outtime, long long nSecond) = 0;
     // 返回距离 00:00:00 的秒数
     virtual int getSecondsFromBase(const CTime& time) = 0;
 
@@ -117,8 +124,8 @@ class CPP_CALENDAR_API CCalenderBase {
     virtual int getDiffByTwoTime(const CTime& timeA, const CTime& timeB) = 0;
 
     // 返回两个日期时间的秒数差
-    virtual long long getSecondByTwoDateTime(const CDateTime& datetimeA,
-                                     const CDateTime& datetimeB) = 0;
+    virtual long long getSecondByTwoDateTime(const CDateTime& datetimeA, const CDateTime& datetimeB) = 0;
+
 public:
     // 获取四柱
     CGanZhi const& getSizhu() const;
@@ -128,17 +135,18 @@ class CPP_CALENDAR_API CCalenderBase {
     CJieQi const& getJieSecond() const;
 
 protected:
-    CDateTime m_datetime;   // 传入的时间日期
-    CDateTime m_ldatetime;  // 计算的农历日期
-    bool      m_isLeap{};   // 当月是否是闰月
-    bool      m_bigMon{};   // 当月是否是大月
-    CJieQi    m_first;      // 当月第一个节气
-    CJieQi    m_second;     // 当月第二个节气
-    CGanZhi   m_sizhu;      // 此时的四柱
+    CDateTime m_datetime;    // 传入的时间日期
+    CDateTime m_ldatetime;   // 计算的农历日期
+    bool      m_isLeap{};    // 当月是否是闰月
+    bool      m_bigMon{};    // 当月是否是大月
+    CJieQi    m_first;       // 当月第一个节气
+    CJieQi    m_second;      // 当月第二个节气
+    CGanZhi   m_sizhu;       // 此时的四柱
 };
 
 // 日历类实例生成工厂
-class CPP_CALENDAR_API CCalenderFactory {
+class CPP_CALENDAR_API CCalenderFactory
+{
 private:
     CCalenderFactory() = default;
     ~CCalenderFactory() = default;
@@ -149,5 +157,5 @@ class CPP_CALENDAR_API CCalenderFactory {
     // 释放内存
     static void freeCalender(CCalenderBase* pCalender);
 };
-}  // namespace cppbox
+}   // namespace cppbox
 #endif