mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore CMake support of Darwin + XQuartz + fink test platform

Browse Source
This commit is contained in:
ManoloFLTK 2019-10-30 21:13:52 +01:00
parent 8c6f1b8ece
commit 527327b8e4
2 changed files with 4 additions and 5 deletions

3
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__")

6
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.