MirrorSave
/
libcaesium
mirror of https://github.com/Lymphatus/libcaesium.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Matteo Paonessa 2019-01-31 10:31:04 +01:00
parent 9ded814b91 6fbad35e18
commit 978af3b172
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,7 +8,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# The version number. # The version number.
set(VERSION_MAJOR 0) set(VERSION_MAJOR 0)
set(VERSION_MINOR 4) set(VERSION_MINOR 4)
set(VERSION_PATCH 1) set(VERSION_PATCH 2)
configure_file( configure_file(
"caesium/config.h.in" "caesium/config.h.in"

6
caesium/CMakeLists.txt
View File

@ -1,8 +1,8 @@
if (NOT WIN32) if (NOT WIN32)
set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "--std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
else() else ()
set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
endif() endif ()
if (APPLE) if (APPLE)
find_library(zopflipng zopflipng /usr/local/lib) find_library(zopflipng zopflipng /usr/local/lib)
@ -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) 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 # Make sure the compiler can find include files for our Caesium library
# when other libraries or executables link to Caesium # when other libraries or executables link to Caesium

2
caesium/png.c
View File

@ -5,7 +5,7 @@
#define STBIW_ASSERT(x) #define STBIW_ASSERT(x)
#include <stdlib.h> #include <stdlib.h>
#include <zopflipng/zopflipng_lib.h> #include <zopflipng_lib.h>
#include "vendor/stb_image.h" #include "vendor/stb_image.h"
#include "vendor/stb_image_write.h" #include "vendor/stb_image_write.h"