[devil] Enable static builds

This commit is contained in:
Robert Schumacher 2017-11-21 22:50:03 -08:00
parent 31bbb8be37
commit 46288a5a6d
4 changed files with 34 additions and 29 deletions

View File

@ -6,7 +6,7 @@ index 346758f..298a207 100644
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
-#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS

View File

@ -1,4 +1,4 @@
Source: devil
Version: 1.8.0
Version: 1.8.0-1
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr, jasper, liblzma
Description: A full featured cross-platform image library

View File

@ -0,0 +1,26 @@
diff --git a/devil/src-ILU/CMakeLists.txt b/devil/src-ILU/CMakeLists.txt
index 17a3afe..a46ab41 100644
--- a/devil/src-ILU/CMakeLists.txt
+++ b/devil/src-ILU/CMakeLists.txt
@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILU_INC} )
source_group("Resource Files" FILES ${ILU_RSRC} )
# Remove SHARED to create a static library
-add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
+add_library(ILU ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
## ILU requires IL
diff --git a/devil/src-ILUT/CMakeLists.txt b/devil/src-ILUT/CMakeLists.txt
index 21470cb..398d3c1 100644
--- a/devil/src-ILUT/CMakeLists.txt
+++ b/devil/src-ILUT/CMakeLists.txt
@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILUT_INC} )
source_group("Resource Files" FILES ${ILUT_RSRC} )
# Remove SHARED to create a static library
-add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
+add_library(ILUT ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
## add link sub library info
target_link_libraries(ILUT

View File

@ -1,16 +1,3 @@
# Common Ambient Variables:
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
#
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(DEVIL_VERSION 1.8.0)
@ -19,29 +6,21 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DentonW/DevIL
REF v${DEVIL_VERSION}
SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
HEAD_REF master
)
set(DEVIL_SHARED OFF)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(DEVIL_SHARED ON)
else()
set(DEVIL_SHARED OFF)
endif()
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}/DevIL
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_fix-encoding.patch
${CMAKE_CURRENT_LIST_DIR}/0002_fix-missing-mfc-includes.patch
SOURCE_PATH ${SOURCE_PATH}/DevIL
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_fix-encoding.patch
${CMAKE_CURRENT_LIST_DIR}/0002_fix-missing-mfc-includes.patch
${CMAKE_CURRENT_LIST_DIR}/enable-static.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/DevIL
PREFER_NINJA
OPTIONS
-DBUILD_SHARED_LIBS=${DEVIL_SHARED}
)
vcpkg_install_cmake()