cmake: Improve building with the system libpng.
This also now requires at least libpng16 instead of libpng17. v2: Require libpng17 on arm platforms. v3: Fix the android and windows travis builds.
This commit is contained in:
parent
03b9c40fae
commit
c8c7889f0f
9 changed files with 34 additions and 30 deletions
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include <algorithm>
|
||||
#ifndef USING_QT_UI
|
||||
#include <libpng17/png.h>
|
||||
#include <png.h>
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
#include "data/base64.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue