diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-30 21:13:52 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-30 21:13:52 +0100 |
| commit | 527327b8e454caa6bd2c0b2947ea8c0563883ba1 (patch) | |
| tree | e9a677bb428fd4d12a65fcee59881112273595b4 | |
| parent | 8c6f1b8ece078a079aaa018c91085db92d63646c (diff) | |
Restore CMake support of Darwin + XQuartz + fink test platform
| -rw-r--r-- | CMake/setup.cmake | 3 | ||||
| -rw-r--r-- | src/Fl_SVG_Image.cxx | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CMake/setup.cmake b/CMake/setup.cmake index 9bc4ef078..8a261bc97 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -96,8 +96,7 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__") if(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.8") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD") endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0) elseif(OPTION_APPLE_SDL) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__") diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index a2a1970cc..709f2c15a 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -26,9 +26,6 @@ #include "Fl_Screen_Driver.H" #include <stdio.h> #include <stdlib.h> -#if defined(HAVE_LIBZ) -#include <zlib.h> -#endif #if !defined(HAVE_LONG_LONG) static double strtoll(const char *str, char **endptr, int base) { @@ -43,6 +40,9 @@ static double strtoll(const char *str, char **endptr, int base) { #define NANOSVGRAST_IMPLEMENTATION // Expands implementation #include "../nanosvg/nanosvgrast.h" +#if defined(HAVE_LIBZ) +#include <zlib.h> +#endif /** The constructor loads the SVG image from the given .svg/.svgz filename or in-memory data. \param filename Name of a .svg or .svgz file, or NULL. |