1722245666

Author: Oleh Kulykov

CMakeLists.txt

@@ -1028,7 +1028,7 @@ source_group("CPP/7zip/Crypto"
 
 if (LIBPLZMA_OPT_SHARED)
   add_library(plzma SHARED ${LIBPLZMA_SOURCES} ${LIBPLZMA_PUBLIC_HEADERS} ${LIBPLZMA_INTERNAL_HEADERS})
-  set_property(TARGET plzma APPEND PROPERTY COMPILE_FLAGS -DLIBPLZMA_SHARED)
+  set_property(TARGET plzma APPEND PROPERTY COMPILE_FLAGS -DLIBPLZMA_SHARED=1)
   if (MSVC)
     message("Shared lib. MSVC")
     # MSVC does not append 'lib' - do it here to have consistent name
@@ -1045,7 +1045,7 @@ endif()
 
 if (LIBPLZMA_OPT_STATIC)
   add_library(plzma_static STATIC ${LIBPLZMA_SOURCES} ${LIBPLZMA_PUBLIC_HEADERS} ${LIBPLZMA_INTERNAL_HEADERS})
-  set_property(TARGET plzma_static APPEND PROPERTY COMPILE_FLAGS -DLIBPLZMA_STATIC)
+  set_property(TARGET plzma_static APPEND PROPERTY COMPILE_FLAGS -DLIBPLZMA_STATIC=1)
   if (MSVC)
     # MSVC does not append 'lib' - do it here to have consistent name
     set_target_properties(plzma_static PROPERTIES PREFIX "lib")

libplzma.h

@@ -53,7 +53,7 @@
 #define LIBPLZMA_VERSION_PATCH 4
 
 // check windows
-#if defined(WIN32) || defined(_WIN32) || defined(WIN32_LEAN_AND_MEAN) || defined(_WIN64) || defined(WIN64)
+#if defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(WIN64) || defined(WIN32_LEAN_AND_MEAN)
 #  define LIBPLZMA_OS_WINDOWS 1
 #endif
 
@@ -80,7 +80,18 @@
 
 // if not using/building shared or static, then static
 #if !defined(LIBPLZMA_SHARED) && !defined(LIBPLZMA_STATIC)
-#  define LIBPLZMA_STATIC
+#  if defined(LIBPLZMA_OS_WINDOWS) && (defined(_MSC_VER) || defined(_MSC_FULL_VER))
+#    if defined(_MT) && (_MT > 0)
+#      if defined(_DLL)
+#        define LIBPLZMA_SHARED 1
+#      else
+#        define LIBPLZMA_STATIC 1
+#      endif // _DLL
+#    endif // _MT
+#  endif // LIBPLZMA_OS_WINDOWS && (_MSC_VER || _MSC_FULL_VER)
+#  if !defined(LIBPLZMA_SHARED) && !defined(LIBPLZMA_STATIC)
+#    define LIBPLZMA_STATIC 1
+#  endif
 #endif
 
 // dll api

src/plzma.cpp

@@ -244,6 +244,7 @@ const char * LIBPLZMA_NONNULL plzma_version(void) {
 #endif
 
 #if defined(LIBPLZMA_MSC)
+// https://learn.microsoft.com/en-us/cpp/overview/compiler-versions
 #  if defined(_MSC_FULL_VER)
     " : MSVC-" LIBPLZMA_TOSTRING(_MSC_FULL_VER)
 #  elif defined(_MSC_VER)
@@ -256,12 +257,12 @@ const char * LIBPLZMA_NONNULL plzma_version(void) {
 #    if defined(_DLL)
 //     Causes the application to use the multithread-specific and DLL-specific version of the run-time library.
 //     Defines _MT and _DLL and causes the compiler to place the library name MSVCRT.lib into the .obj file.
-    ", multithreaded DLL"
+    " : multithreaded DLL"
 #    else
 //     Causes the application to use the multithread, static version of the run-time library.
 //     Defines _MT and causes the compiler to place the library name LIBCMT.lib into the .obj file
 //       so that the linker will use LIBCMT.lib to resolve external symbols.
-    ", multithreaded"
+    " : multithreaded"
 #    endif // _DLL
 #  endif  // _MT && _MT > 0
 #endif