Fixed: compilation for MINGW

OpenImageViewer · Jun 24, 2024 · b17ad23 · b17ad23
1 parent c93dc35
commit b17ad23
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/Codecs/CodecJPG/CMakeLists.txt b/Codecs/CodecJPG/CMakeLists.txt
@@ -32,7 +32,7 @@ add_subdirectory(${libjpeg-turboFolder} ./external/libjpeg-turbo)
 target_include_directories(${TargetName} PRIVATE ${libjpeg-turboFolder})
 
 target_link_libraries(${TargetName} turbojpeg)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND  NOT MINGW)
     target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:turbojpeg>.dll")
 else()
 endif()
diff --git a/Codecs/CodecPNG/CMakeLists.txt b/Codecs/CodecPNG/CMakeLists.txt
@@ -56,7 +56,7 @@ target_include_directories(${TargetName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ext
 target_link_libraries(${TargetName} png_shared )
 target_include_directories(png_shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/zlib)
 
-if(MSVC)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC"))
   target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:png_shared>.dll")
   target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:zlib>.dll")
 endif()
diff --git a/Codecs/CodecTiff/CMakeLists.txt b/Codecs/CodecTiff/CMakeLists.txt
@@ -68,7 +68,6 @@ target_include_directories(${TargetName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ext
 
 
 target_link_libraries(${TargetName} tiff)
-if(MSVC)
-   #set_property(TARGET tiff PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS true)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT MINGW)
    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:tiff>.dll")
 endif()
diff --git a/Example/example.cpp b/Example/example.cpp
@@ -21,9 +21,14 @@ int main()
 
 			std::cout << "\ncat.png has been encoded in: " << std::setprecision(2) << std::fixed<< encodeTime.GetElapsedTimeReal(LLUtils::StopWatch::Milliseconds) << " ms";
 		}
+		else
+		{
+			std::cout << "\nError, cannot encode image";
+		}
 	}
 	else
 	{
+		std::cout << "\nError, cannot decode image";
 		resultCode = 1;
 	}
 

diff --git a/External/LLUtils b/External/LLUtils
diff --git a/External/libpsd b/External/libpsd
diff --git a/ImageUtil/CMakeLists.txt b/ImageUtil/CMakeLists.txt
@@ -8,4 +8,4 @@ add_library (${TargetName} STATIC ${sourceFiles})
 
 target_include_directories(${TargetName} PRIVATE ./Include)
 target_include_directories(${TargetName} PRIVATE ./Source)
-target_include_directories(${TargetName} PRIVATE ../External/ExoticNumbers/Include)
+target_include_directories(${TargetName} PRIVATE ../External/ExoticNumbers/include)
diff --git a/ImageUtil/Include/ImageUtil/ImageUtil.h b/ImageUtil/Include/ImageUtil/ImageUtil.h
@@ -324,7 +324,7 @@ namespace IMUtil
                 std::span sourceData(reinterpret_cast<const SourceSampleType*>(sampleData), totalPixels);
                 std::span bgraData(reinterpret_cast<PixelUtil::BitTexel32Ex*>(imageItem->data.data()), totalPixels);
                 //Find minMax is a single pass since image data is consecutive 
-                auto minMax = std::minmax_element(std::execution::parallel_unsequenced_policy(), std::begin(sourceData), std::end(sourceData));
+                auto minMax = std::minmax_element(std::execution::par_unseq, std::begin(sourceData), std::end(sourceData));
                 NormalizeAnyToRGBA(std::begin(bgraData), std::end(bgraData), std::begin(sourceData), std::end(sourceData), normalizeMode, std::make_pair(*minMax.first, *minMax.second) );
             }
             else

diff --git a/ImageUtil/Source/ImageUtil.cpp b/ImageUtil/Source/ImageUtil.cpp
@@ -1,5 +1,5 @@
 #include <ImageUtil/ImageUtil.h> 
-#include <ImageUtil\TexelConvertor.h>
+#include <ImageUtil/TexelConvertor.h>
 #include <ExoticNumbers/Float24.h>
 #include <ExoticNumbers/half.hpp>