mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-10 03:44:16 +00:00
Force to build internal libraries as STATIC object
Preventing to some compilation errors where BUILD_SHARED_LIBS incorrectly enabled (#698).
This commit is contained in:
parent
893f757eea
commit
cc77d634c2
@ -37,6 +37,11 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
|
|||||||
# Aseprite project
|
# Aseprite project
|
||||||
project(aseprite C CXX)
|
project(aseprite C CXX)
|
||||||
|
|
||||||
|
# This required for KDE/Qt destop integration, which sets BUILD_SHARED_LIBS to
|
||||||
|
# TRUE by defualt
|
||||||
|
set(BUILD_SHARED_LIBS off)
|
||||||
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Options (these can be specified in cmake command line or modifying
|
# Options (these can be specified in cmake command line or modifying
|
||||||
# CMakeCache.txt)
|
# CMakeCache.txt)
|
||||||
@ -182,7 +187,6 @@ else()
|
|||||||
${CMAKE_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file
|
${CMAKE_BINARY_DIR}/third_party/zlib) # Zlib generated zconf.h file
|
||||||
endif()
|
endif()
|
||||||
include_directories(${ZLIB_INCLUDE_DIRS})
|
include_directories(${ZLIB_INCLUDE_DIRS})
|
||||||
message(${ZLIB_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
# libpng
|
# libpng
|
||||||
if(USE_SHARED_LIBPNG)
|
if(USE_SHARED_LIBPNG)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user