ソースを参照

Merge branch 'development' into deprecated_logic_module

# Conflicts:
#	README.md
Patrick-Christopher Mattulat 1 年間 前
コミット
020a14d14a

+ 3 - 2
CMakeLists.txt

@@ -11,7 +11,7 @@
 ##########################################################
 
 cmake_minimum_required(VERSION 3.17)
-project(ls_std VERSION 2022.2.0)
+project(ls_std VERSION 2022.3.0)
 
 set(MODULE_NAME_BOXING ls_std_boxing)
 set(MODULE_NAME_CORE ls_std_core)
@@ -414,7 +414,8 @@ endif ()
 
 add_executable(cli_base64
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/encoding/cli/cli_base64_main.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/encoding/Base64.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/encoding/Base64.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/core/Version.cpp)
 
 ##########################################################
 # Build Library (event)

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-# Lynar Studios - Standard Library 2022.2.0 #
+# Lynar Studios - Standard Library 2022.3.0 #
 
 This is a cross-platform standard library written in C++ offering functionalities you would usually miss in C++'s standard template library (STL), especially if you would search for cross-platform implementations.  
 This library has been tested on __Windows__, __Linux__ and __MacOS__ systems.

+ 2 - 2
include/ls_std/core/LibraryVersion.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-05-02
- * Changed:         2022-07-02
+ * Changed:         2022-08-09
  *
  * */
 
@@ -16,7 +16,7 @@ namespace ls::std::core
 {
   static ::std::string getVersion()
   {
-    return "2022.2.0";
+    return "2022.3.0";
   }
 }
 

+ 3 - 3
include/ls_std/os/dynamic_goal.hpp

@@ -3,17 +3,17 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2022-06-29
- * Changed:         2022-06-29
+ * Changed:         2022-07-17
  *
  * */
 
 #ifndef LS_STD_DYNAMIC_GOAL_HPP
 #define LS_STD_DYNAMIC_GOAL_HPP
 
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_MSC_VER)
 #include <ls_std/os/windows/msvc_dll_definitions.hpp>
 #endif
-#if defined(unix) || defined(__APPLE__)
+#if defined(unix) || defined(__APPLE__) || defined(_WIN32) && defined(__GNUC__)
 #include <ls_std/os/unix/unix_so_definitions.hpp>
 #endif
 

+ 2 - 2
test/cases/core/LibraryVersionTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-05-02
- * Changed:         2022-07-02
+ * Changed:         2022-08-09
  *
  * */
 
@@ -28,6 +28,6 @@ namespace
 
   TEST_F(LibraryVersionTest, getVersion)
   {
-    ASSERT_STREQ("2022.2.0", ls::std::core::getVersion().c_str());
+    ASSERT_STREQ("2022.3.0", ls::std::core::getVersion().c_str());
   }
 }