making on windows working ay

Almond.cpp

@@ -251,6 +251,7 @@ void Almond::on_exportImage_clicked()
         iei.generator = &g;
         iei.gradient = mw->getGradient();
         iei.path = dialog.getPath().toStdString();
+        iei.options.jpegQuality = 20;
         submitBackgroundTask(new ImageExportTask(iei));
 
         /*auto exprt = [iei, path = dialog.getPath().toStdString()]() {

BackgroundTask.cpp

@@ -16,7 +16,7 @@ ImageExportTask::ImageExportTask(const alm::ImageExportInfo& iei) :
 void ImageExportTask::run(void)
 {
     try {
-        alm::exportPng(iei, [this](float percentage) {
+        alm::exportImage(iei, [this](float percentage) {
             emit progress(percentage);
         });
         emit finished(true, "Image successfully exported.");

exportdialogs.cpp

@@ -57,7 +57,7 @@ void ExportImageDialog::on_pushButton_clicked()
         formatString += "PNG image (*.png);;";
     }
     if (alm::supportsImageFormat(alm::ImageFormat::JPEG)) {
-        formatString += "JPEG image (*.jpg *.jpeg)";
+        formatString += "JPEG image (*.jpg *.jpeg);;";
     }
     if (alm::supportsImageFormat(alm::ImageFormat::BMP)) {
         formatString += "BMP image (*.bmp *.dib);;";

libalmond/CMakeLists.txt

@@ -36,26 +36,26 @@ else()
     set(PNG_BUILD_ZLIB ON CACHE BOOL "build zlib ourselves")
     add_subdirectory(zlib-1.2.11)
     set(ZLIB_LIBRARY zlibstatic)
-    #foreach(header ${ZLIB_PUBLIC_HDRS})
-    #    get_filename_component(the_incluude ${header} DIRECTORY)
-    #    list(APPEND ZLIB_PUB_INCLUDE ${the_incluude})
-    #endforeach()
-    #set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.11 ${ZLIB_PUB_INCLUDE} )
+    foreach(header ${ZLIB_PUBLIC_HDRS})
+        get_filename_component(the_incluude ${header} DIRECTORY)
+        list(APPEND ZLIB_PUB_INCLUDE ${the_incluude})
+    endforeach()
+    set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zlib-1.2.11 ${ZLIB_PUB_INCLUDE} )
     
     set(SKIP_INSTALL_ALL ON)
     add_subdirectory(lpng1637)
-    #foreach(header ${libpng_public_hdrs})
-    #    get_filename_component(the_incluude ${header} DIRECTORY)
-    #    list(APPEND PNG_PUB_INCLUDE ${the_incluude})
-    #endforeach()
-    target_link_libraries(png_static PRIVATE zlibstatic)
-    #target_include_directories(libalmond PRIVATE ${PNG_PUB_INCLUDE})
-    #target_include_directories(libalmond PRIVATE ${ZLIB_INCLUDE_DIR})
+    foreach(header ${libpng_public_hdrs})
+        get_filename_component(the_incluude ${header} DIRECTORY)
+        list(APPEND PNG_PUB_INCLUDE ${the_incluude})
+    endforeach()
+    #target_link_libraries(png_static PRIVATE zlibstatic)
+    target_include_directories(libalmond PRIVATE ${PNG_PUB_INCLUDE})
+    target_include_directories(libalmond PRIVATE ${ZLIB_INCLUDE_DIR})
     target_link_libraries(libalmond PRIVATE png_static)
 endif()
 
 if (JPEG_FOUND AND WITH_LIBJPEG)
-    target_link_libraries(libalmond PRIVATE JPEG::JPEG)
+    target_link_libraries(libalmond PUBLIC JPEG::JPEG)
     target_compile_definitions(libalmond PUBLIC WITH_LIBJPEG)
 endif()
 

libmandel/CMakeLists.txt

@@ -18,7 +18,6 @@ find_package(OpenMP)
 #set(Boost_DEBUG 1)
 set(Boost_USE_STATIC_LIBS ON)
 set(ASMJIT_STATIC ON)
-set(ASMJIT_EMBED ON)
 find_package(Boost 1.65 REQUIRED)
 
 
@@ -78,12 +77,9 @@ target_include_directories(qd PUBLIC qd-2.3.22/include qd-2.3.22)
 target_link_libraries(mandel PUBLIC qd)
 
 if(WITH_ASMJIT)
-    set(ASMJIT_LIBS "" PARENT_SCOPE)
     add_subdirectory(asmjit)
-    message("depps " ${ASMJIT_LIBS})
     target_compile_definitions(mandel PUBLIC WITH_ASMJIT)
-    target_link_libraries(mandel PUBLIC asmjit)
-    target_link_libraries(mandel PRIVATE ${ASMJIT_LIBS})
+    target_link_libraries(mandel PUBLIC AsmJit::AsmJit)
 endif(WITH_ASMJIT)
 
 

libmandel/asmjit/CMakeLists.txt

@@ -220,7 +220,7 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   list(APPEND ASMJIT_DEPS rt)
 endif()
 
-set(ASMJIT_LIBS ${ASMJIT_DEPS} PARENT_SCOPE)
+set(ASMJIT_LIBS ${ASMJIT_DEPS})
 if (NOT ASMJIT_EMBED)
   list(INSERT ASMJIT_LIBS 0 asmjit)
 endif()