Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
978af3b172
|
@ -8,7 +8,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
|||
# The version number.
|
||||
set(VERSION_MAJOR 0)
|
||||
set(VERSION_MINOR 4)
|
||||
set(VERSION_PATCH 1)
|
||||
set(VERSION_PATCH 2)
|
||||
|
||||
configure_file(
|
||||
"caesium/config.h.in"
|
||||
|
|
|
@ -19,7 +19,7 @@ add_library(caesium_static STATIC caesium.c error.c utils.c png.c vendor/lodepng
|
|||
|
||||
set_target_properties(caesium_static PROPERTIES OUTPUT_NAME caesium)
|
||||
|
||||
target_link_libraries(caesium zopflipng jpeg turbojpeg)
|
||||
target_link_libraries(caesium jpeg turbojpeg zopflipng)
|
||||
|
||||
# Make sure the compiler can find include files for our Caesium library
|
||||
# when other libraries or executables link to Caesium
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#define STBIW_ASSERT(x)
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <zopflipng/zopflipng_lib.h>
|
||||
#include <zopflipng_lib.h>
|
||||
|
||||
#include "vendor/stb_image.h"
|
||||
#include "vendor/stb_image_write.h"
|
||||
|
|
Loading…
Reference in New Issue