diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL index dc80b4c41b..89af7e7d34 100644 --- a/ports/blaze/CONTROL +++ b/ports/blaze/CONTROL @@ -1,4 +1,4 @@ Source: blaze -Version: 3.4-1 +Version: 3.5 Build-Depends: clapack, boost-exception Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index a448082498..216a901092 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3 - SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25 + REF cac64f2b35002f74a8ad2410ce6fb562b2cd2371 + SHA512 89381d77e518cdea40b0aa5013b8c74cbd737a2ce8d2d6869df1789a8154d2170c692ce04cae907704808fcff4a52fe0860d3fa2ee898780ce650a294b10894f HEAD_REF master PATCHES avoid-src-dir-generation.patch diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 74f6119446..d15d641559 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.7.0 +Version: 1.7.1 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 4752f59736..e00158d700 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.7.0 - SHA512 e8a1fa8c09c2c2e4d805c5faa119f5d3d2bd3d18ca6bbc28be8890adbc53ea8c53a5b73ee2911fff7dadef6b0d4b870b1b574367ed520a790ee6ce34cbfe9c59 + REF v1.7.1 + SHA512 774ba3828c89ca8f0857a14d9823c11f116667f2fc305e6b2c73ccf3b194b50947821ec14073c618fc644bf6b597f6802cc2337d8a7425de4f42ba5b46e8370f HEAD_REF master ) diff --git a/ports/devil/0003_fix-openexr.patch b/ports/devil/0003_fix-openexr.patch new file mode 100644 index 0000000000..d8038e4cf8 --- /dev/null +++ b/ports/devil/0003_fix-openexr.patch @@ -0,0 +1,109 @@ +--- a/DevIL/src-IL/cmake/FindOpenEXR.cmake ++++ b/DevIL/src-IL/cmake/FindOpenEXR.cmake +@@ -1,64 +1,13 @@ +-# Locate OpenEXR +-# This module defines +-# OPENEXR_LIBRARIES +-# OPENEXR_FOUND, if false, do not try to link to OpenEXR +-# OPENEXR_INCLUDE_DIR, where to find the headers +-# +-# $OPENEXR_DIR is an environment variable that would +-# correspond to the ./configure --prefix=$OPENEXR_DIR +-# +-# Created by Robert Osfield. ++include(FindPackageHandleStandardArgs) + ++find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR) + +-FIND_PATH(OPENEXR_INCLUDE_DIR ImfIO.h +- $ENV{OPENEXR_DIR}/include +- $ENV{OPENEXR_DIR} +- ~/Library/Frameworks +- /Library/Frameworks +- /usr/local/include +- /usr/include +- /sw/include # Fink +- /opt/local/include # DarwinPorts +- /opt/csw/include # Blastwave +- /opt/include +- /usr/freeware/include +-) ++find_library(OPENEXR_HALF_LIBRARY NAMES Half) ++find_library(OPENEXR_IEX_LIBRARY NAMES Iex-2_2) ++find_library(OPENEXR_IMATH_LIBRARY NAMES Imath-2_2) ++find_library(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf-2_2) ++find_library(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread-2_2) + +-# Macro to find exr libraries (deduplicating search paths) +-# example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf) +-MACRO(OPENEXR_FIND_VAR varname libname) +- FIND_LIBRARY( ${varname} +- NAMES ${libname} +- PATHS +- $ENV{OPENEXR_DIR}/lib +- $ENV{OPENEXR_DIR} +- ~/Library/Frameworks +- /Library/Frameworks +- /usr/local/lib +- /usr/lib +- /sw/lib +- /opt/local/lib +- /opt/csw/lib +- /opt/lib +- /usr/freeware/lib64 +- ) +-ENDMACRO(OPENEXR_FIND_VAR) ++set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY}) + +-# Macro to find exr libraries (and debug versions) +-# example: OPENEXR_FIND(IlmImf) +-MACRO(OPENEXR_FIND libname) +- OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY ${libname}) +- OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) +-ENDMACRO(OPENEXR_FIND) +- +-OPENEXR_FIND(IlmImf) +-OPENEXR_FIND(IlmThread) +-OPENEXR_FIND(Iex) +-OPENEXR_FIND(Half) +- +-SET(OPENEXR_FOUND "NO") +-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) +- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) +- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) +- SET(OPENEXR_FOUND "YES") +-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) ++find_package_handle_standard_args(OPENEXR REQUIRED_VARS OPENEXR_LIBRARIES OPENEXR_INCLUDE_PATHS) +--- a/DevIL/src-IL/src/il_exr.cpp ++++ b/DevIL/src-IL/src/il_exr.cpp +@@ -15,14 +15,14 @@ + #ifndef IL_NO_EXR + + #ifndef HAVE_CONFIG_H // We are probably on a Windows box . +-//#define OPENEXR_DLL +-#define HALF_EXPORTS ++#define OPENEXR_DLL ++//#define HALF_EXPORTS + #endif //HAVE_CONFIG_H + + #include "il_exr.h" +-#include +-#include +-#include ++#include ++#include ++#include + //#include + //#include + //#include +--- a/DevIL/src-IL/include/il_exr.h ++++ b/DevIL/src-IL/include/il_exr.h +@@ -15,7 +15,7 @@ + #define EXR_H + + #include "il_internal.h" +-#include ++#include + + + //using namespace Imf; // Using this leads to errors with Microsoft's IStream. diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index ff4e7ee0c0..7ab5a6c068 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 0001_fix-encoding.patch 0002_fix-missing-mfc-includes.patch + 0003_fix-openexr.patch enable-static.patch ) diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 4e726c6625..ab2e80e878 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,5 +1,5 @@ Source: dlib -Version: 19.16 +Version: 19.16-1 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ diff --git a/ports/dlib/fix-mac-jpeg.patch b/ports/dlib/fix-mac-jpeg.patch new file mode 100644 index 0000000000..5f961264bf --- /dev/null +++ b/ports/dlib/fix-mac-jpeg.patch @@ -0,0 +1,12 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -480,7 +480,7 @@ + set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) + CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD) + endif() +- if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE) ++ if (JPEG_FOUND AND LIBJPEG_IS_GOOD) + include_directories(${JPEG_INCLUDE_DIR}) + set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY}) + else() diff --git a/ports/dlib/fix-sqlite3-fftw-linkage.patch b/ports/dlib/fix-sqlite3-fftw-linkage.patch new file mode 100644 index 0000000000..84ab0c2653 --- /dev/null +++ b/ports/dlib/fix-sqlite3-fftw-linkage.patch @@ -0,0 +1,57 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -747,32 +750,15 @@ + + + if (DLIB_LINK_WITH_SQLITE3) +- find_library(sqlite sqlite3) +- # make sure sqlite3.h is in the include path +- find_path(sqlite_path sqlite3.h) +- if (sqlite AND sqlite_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) +- else() +- set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) +- endif() +- mark_as_advanced(sqlite sqlite_path) ++ find_package(sqlite3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} sqlite3 ) + endif() + + + + if (DLIB_USE_FFTW) +- find_library(fftw fftw3) +- # make sure fftw3.h is in the include path +- find_path(fftw_path fftw3.h) +- if (fftw AND fftw_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} ) +- else() +- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE ) +- toggle_preprocessor_switch(DLIB_USE_FFTW) +- endif() +- mark_as_advanced(fftw fftw_path) ++ find_package(FFTW3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3) + endif() + + +--- a/dlib/cmake_utils/dlibConfig.cmake.in ++++ b/dlib/cmake_utils/dlibConfig.cmake.in +@@ -28,6 +28,14 @@ + include("${dlib_CMAKE_DIR}/dlib.cmake") + endif() + ++include(CMakeFindDependencyMacro) ++if("@DLIB_USE_FFTW@") ++ find_dependency(FFTW3 CONFIG) ++endif() ++if("@DLIB_LINK_WITH_SQLITE3@") ++ find_dependency(sqlite3 CONFIG) ++endif() ++ + set(dlib_LIBRARIES dlib::dlib) + set(dlib_LIBS dlib::dlib) + set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index f6cdf4eeb6..427de4a8d2 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -11,6 +11,9 @@ vcpkg_from_github( REF v19.16 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887 HEAD_REF master + PATCHES + fix-mac-jpeg.patch + fix-sqlite3-fftw-linkage.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg) @@ -40,6 +43,7 @@ vcpkg_configure_cmake( -DDLIB_USE_CUDA=${WITH_CUDA} -DDLIB_GIF_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF + -DCMAKE_DEBUG_POSTFIX=d OPTIONS_DEBUG -DDLIB_ENABLE_ASSERTS=ON #-DDLIB_ENABLE_STACK_TRACE=ON diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL new file mode 100644 index 0000000000..9676b708b5 --- /dev/null +++ b/ports/ensmallen/CONTROL @@ -0,0 +1,5 @@ +Source: ensmallen +Version: 1.14.0 +Description: A header-only C++ library for mathematical optimization. +Build-Depends: openblas, clapack, armadillo + diff --git a/ports/ensmallen/disable_tests.patch b/ports/ensmallen/disable_tests.patch new file mode 100644 index 0000000000..80dd7e8691 --- /dev/null +++ b/ports/ensmallen/disable_tests.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1577be5..b0171b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/ensmallen_bits" + install(FILES ${CMAKE_SOURCE_DIR}/include/ensmallen.hpp + DESTINATION "${CMAKE_INSTALL_PREFIX}/include") + +-enable_testing() +- +-add_subdirectory(tests) ++# Disable tests ++#enable_testing() ++# ++#add_subdirectory(tests) diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake new file mode 100644 index 0000000000..dd03620f5a --- /dev/null +++ b/ports/ensmallen/portfile.cmake @@ -0,0 +1,21 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlpack/ensmallen + REF ensmallen-1.14.0 + SHA512 a0b3660a0d01f5bc79fe302f08161a0b4d16fa006cc1d95cf24e046d2a4ab48de49b7644023837ed93426b982fbd0861d6c2774c0a80f4d2392ce494291ff70a + HEAD_REF master + PATCHES + disable_tests.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ensmallen RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt index edf46624dd..cfd460e207 100644 --- a/ports/gettext/CMakeLists.txt +++ b/ports/gettext/CMakeLists.txt @@ -3,8 +3,6 @@ project(libintl C) find_package(unofficial-iconv REQUIRED) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/config .) - set(CMAKE_STATIC_LIBRARY_PREFIX) set(CMAKE_SHARED_LIBRARY_PREFIX) @@ -23,27 +21,28 @@ else() set(HAVE_ASPRINTF 1) set(HAVE_WPRINTF 1) set(HAVE_NEWLOCALE 1) - add_definitions(-DHAVE_NEWLOCALE=1) - - set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) - if(NOT CMAKE_USE_PTHREADS_INIT) - message(FATAL_ERROR "Error: Only pthreads is currently supported.") - endif() - - include(CheckFunctionExists) - include(CheckIncludeFiles) - - if(APPLE) - set(HAVE_CFLOCALECOPYCURRENT 1) - set(HAVE_CFPREFERENCESCOPYAPPVALUE 1) - endif() - check_function_exists(dcgettext HAVE_DCGETTEXT) - check_include_files(features.h HAVE_FEATURES_H) - check_function_exists(gettext HAVE_GETTEXT) - check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H) - check_function_exists(mempcpy HAVE_MEMPCPY) + add_definitions(-DHAVE_NEWLOCALE=1) + add_definitions(-DHAVE_NEWLOCALE=1) + + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + if(NOT CMAKE_USE_PTHREADS_INIT) + message(FATAL_ERROR "Error: Only pthreads is currently supported.") + endif() + + include(CheckFunctionExists) + include(CheckIncludeFiles) + + if(APPLE) + set(HAVE_CFLOCALECOPYCURRENT 1) + set(HAVE_CFPREFERENCESCOPYAPPVALUE 1) + endif() + check_function_exists(dcgettext HAVE_DCGETTEXT) + check_include_files(features.h HAVE_FEATURES_H) + check_function_exists(gettext HAVE_GETTEXT) + check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H) + check_function_exists(mempcpy HAVE_MEMPCPY) check_include_files(xlocale.h HAVE_XLOCALE_H) configure_file(intl/libgnuintl.in.h config/libgnuintl.h @ONLY) @@ -106,13 +105,19 @@ add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIB add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -D_CRT_SECURE_NO_WARNINGS") add_library(libintl ${SOURCES}) -target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) -if(APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED) - target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY}) -endif() -if(NOT WIN32) - target_link_libraries(libintl PRIVATE Threads::Threads) +target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv) + +target_include_directories(libintl PUBLIC + $ + $ +) + +if(APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED) + target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY}) +endif() +if(NOT WIN32) + target_link_libraries(libintl PRIVATE Threads::Threads) endif() install(TARGETS libintl @@ -135,3 +140,8 @@ find_dependency(unofficial-iconv) find_dependency(Threads) include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake) ") + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake + DESTINATION share/unofficial-gettext +) \ No newline at end of file diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index 1f96ff7355..386fbd09cf 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,4 +1,4 @@ Source: gettext -Version: 0.19-7 +Version: 0.19-8 Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. Build-Depends: libiconv diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index 20c788f7e1..b6bead6dad 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -2,24 +2,14 @@ cmake_minimum_required(VERSION 3.8) project(gmime C) -set(GLIB_LIB_SUFFIX 2.0) set(GMIME_DLL_SUFFIX 3) set(GMIME_LIB_SUFFIX 3.0) -# Find glib -find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_SUFFIX}) -set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GIO_LIBRARY} ${GLIB_GOBJECT_LIBRARY}) - -# Find other deps -find_path(ICONV_INCLUDE_DIR iconv.h) -find_library(ICONV_LIBRARY NAMES iconv libiconv) - -find_library(IDN_LIBRARY NAMES libidn2 libidn) - find_package(zlib REQUIRED) +find_package(unofficial-glib CONFIG REQUIRED) +find_package(unofficial-iconv REQUIRED) + +find_library(IDN_LIBRARY NAMES libidn2) if(MSVC) add_definitions(-D_CRT_SECURE_NO_DEPRECATE) @@ -29,75 +19,15 @@ endif() add_definitions(-DHAVE_CONFIG_H) add_definitions(-DG_LOG_DOMAIN="GMime") -# List the source files -set(LIB_SRC gmime/gmime.c - gmime/gmime-application-pkcs7-mime.c - gmime/gmime-autocrypt.c - gmime/gmime-certificate.c - gmime/gmime-charset.c - gmime/gmime-common.c - gmime/gmime-content-type.c - gmime/gmime-crypto-context.c - gmime/gmime-data-wrapper.c - gmime/gmime-disposition.c - gmime/gmime-encodings.c - gmime/gmime-events.c - gmime/gmime-filter.c - gmime/gmime-filter-basic.c - gmime/gmime-filter-best.c - gmime/gmime-filter-charset.c - gmime/gmime-filter-checksum.c - gmime/gmime-filter-dos2unix.c - gmime/gmime-filter-enriched.c - gmime/gmime-filter-from.c - gmime/gmime-filter-gzip.c - gmime/gmime-filter-html.c - gmime/gmime-filter-smtp-data.c - gmime/gmime-filter-strip.c - gmime/gmime-filter-unix2dos.c - gmime/gmime-filter-windows.c - gmime/gmime-filter-yenc.c - gmime/gmime-format-options.c - gmime/gmime-gpg-context.c - gmime/gmime-gpgme-utils.c - gmime/gmime-header.c - gmime/gmime-iconv.c - gmime/gmime-iconv-utils.c - gmime/gmime-message.c - gmime/gmime-message-part.c - gmime/gmime-message-partial.c - gmime/gmime-multipart.c - gmime/gmime-multipart-encrypted.c - gmime/gmime-multipart-signed.c - gmime/gmime-object.c - gmime/gmime-param.c - gmime/gmime-parse-utils.c - gmime/gmime-parser.c - gmime/gmime-parser-options.c - gmime/gmime-part.c - gmime/gmime-part-iter.c - gmime/gmime-pkcs7-context.c - gmime/gmime-references.c - gmime/gmime-signature.c - gmime/gmime-stream.c - gmime/gmime-stream-buffer.c - gmime/gmime-stream-cat.c - gmime/gmime-stream-file.c - gmime/gmime-stream-filter.c - gmime/gmime-stream-fs.c - gmime/gmime-stream-gio.c - gmime/gmime-stream-mem.c - gmime/gmime-stream-mmap.c - gmime/gmime-stream-null.c - gmime/gmime-stream-pipe.c - gmime/gmime-text-part.c - gmime/gmime-utils.c - gmime/internet-address.c - util/packed.c - util/url-scanner.c - util/gtrie.c -) +# Source files +file(GLOB LIB_SRC gmime/gmime-*.c) +list(APPEND LIB_SRC gmime/gmime.c + gmime/internet-address.c + util/packed.c + util/url-scanner.c + util/gtrie.c) +# Headers file(GLOB LIB_HEADERS gmime/gmime-*.h) list(APPEND LIB_HEADERS gmime/gmime.h) list(APPEND LIB_HEADERS gmime/internet-address.h) @@ -113,8 +43,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_NAME ${PROJECT_NAME}-${GMIME_LIB_SUFFIX} ) -target_include_directories(${PROJECT_NAME} PRIVATE . ./util ${GLIB_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${GLIB_LIBRARIES} ${ICONV_LIBRARY} ${ZLIB_LIBRARIES} ${IDN_LIBRARY}) +target_include_directories(${PROJECT_NAME} PRIVATE . ./util) +target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::iconv::libiconv ZLIB::ZLIB ${IDN_LIBRARY}) +target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::glib::gobject unofficial::glib::gio unofficial::glib::glib) target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) install(TARGETS ${PROJECT_NAME} diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index febce0ebe1..21cedc5e63 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,4 +1,4 @@ Source: gmime -Version: 3.0.5 +Version: 3.2.3 Build-Depends: zlib, glib, libiconv, libidn2 Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). diff --git a/ports/gmime/gmime.def b/ports/gmime/gmime.def index b072e0d656..e73d0fa01f 100644 --- a/ports/gmime/gmime.def +++ b/ports/gmime/gmime.def @@ -160,6 +160,11 @@ g_mime_filter_gzip_get_type g_mime_filter_gzip_new g_mime_filter_html_get_type g_mime_filter_html_new +g_mime_filter_openpgp_new +g_mime_filter_openpgp_get_data_type +g_mime_filter_openpgp_get_begin_offset +g_mime_filter_openpgp_get_end_offset +g_mime_filter_openpgp_get_type g_mime_filter_reset g_mime_filter_set_size g_mime_filter_smtp_data_get_type @@ -502,7 +507,7 @@ g_mime_stream_mem_set_owner g_mime_stream_mmap_get_type g_mime_stream_mmap_new g_mime_stream_mmap_new_with_bounds -g_mime_stream_null_count_newlines +g_mime_stream_null_set_count_newlines g_mime_stream_null_get_count_newlines g_mime_stream_null_get_type g_mime_stream_null_new diff --git a/ports/gmime/idna.h b/ports/gmime/idna.h deleted file mode 100644 index 3313cdbc7f..0000000000 --- a/ports/gmime/idna.h +++ /dev/null @@ -1,3 +0,0 @@ -// Redirects header from libidn to libidn2 -// Created to avoid sources patching -#include diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index ddfeeb74c5..dbe678834d 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -1,15 +1,15 @@ include(vcpkg_common_functions) set(LIB_NAME gmime) -set(LIB_VERSION 3.0.5) +set(LIB_VERSION 3.2.3) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gmime/3.0/${LIB_FILENAME}" + URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 658b9008ffdf8055ffa9dfe8a5a6036a487309b0419572a9376397f68a8fc17d36ba6a05d2dfcb2ad23e634dc9e2aedd2479df1bfa0b7f8944d4c294650cb6c8 + SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -19,8 +19,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) configure_file(${SOURCE_PATH}/build/vs2010/unistd.h ${SOURCE_PATH} COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/idna.h ${SOURCE_PATH} COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/gmime.def ${SOURCE_PATH} COPYONLY) vcpkg_configure_cmake( diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index 431ba1dc73..ba378b8ff3 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,4 @@ Source: libraw -Version: 0.19.0-1 +Version: 0.19.0-2 Build-Depends: lcms, jasper Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 7badade256..1ed02eab45 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -52,13 +52,17 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore # because otherwise libraries that build on top of libraw have to choose. file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) + if(NOT VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) + endif() # Cleanup file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(REMOVE ${RELEASE_EXECUTABLES}) - file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${DEBUG_EXECUTABLES}) + if(NOT VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${DEBUG_EXECUTABLES}) + endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL index 712a787303..dcdae01a55 100644 --- a/ports/log4cplus/CONTROL +++ b/ports/log4cplus/CONTROL @@ -1,4 +1,4 @@ Source: log4cplus -Version: REL_2_0_1 +Version: REL_2_0_3 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration Build-Depends: catch diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 97a17a4f7f..672d855de1 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -2,16 +2,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_0_1 - SHA512 7a84bf237bb5db3eccd90196c0f97adb75d0dd247d73852150078b9458f169d883f3ae92908217ea668bcf25c64766c86380bbcc64b432eb1bae6427c9268b18 + REF REL_2_0_3 + SHA512 c4c8887137214a9c66545ffa7f13cbede3db1536916681081f53c0a272cfb17d5e42cdc54c2c1bdd6eb5f86c3c3ce0840cbf827f792848ecb8f97636f1fcddf2 HEAD_REF master ) -set(THREADPOOL_REF dda9e3d40502e85ce082c05d2c05c1bc94348b6a) +set(THREADPOOL_REF cc0b6371d3963f7028c2da5fc007733f9f3bf205) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/log4cplus/ThreadPool/archive/${THREADPOOL_REF}.tar.gz" FILENAME "log4cplus-threadpool-${THREADPOOL_REF}.tar.gz" - SHA512 225adb11f447495a00e401d32f63d9a7eb3a8191d477a21bfa3c39f1ff5cbe8bfb7770a740e840c5748f816137cdef1a5915b17d16b3dd4c3399d1a67ab0f381 + SHA512 ad4d287c1f83acac4c127136bc92489c43bb5293613dc54b878b8e75a8583f7eefda6434d09789dad47b87a5d38f10a07a746d42d299410c11f2dbcce8af3012 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL new file mode 100644 index 0000000000..bf7a481ab8 --- /dev/null +++ b/ports/oniguruma/CONTROL @@ -0,0 +1,6 @@ +Source: oniguruma +Version: 2019-02-26 +Description: Modern and flexible regular expressions library + +Feature: non-posix +Description: Disable POSIX API diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake new file mode 100644 index 0000000000..40652b5901 --- /dev/null +++ b/ports/oniguruma/portfile.cmake @@ -0,0 +1,50 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kkos/oniguruma + REF 502b1f416746ed8700498229bbfceb180e400fbc + SHA512 0faf12f415de59716d8faa4d3dc026874c3bd6a3624f75f2a184843025294eb885d57164ae6dcb916cba5c7d1a4da4bcb0dc23fce3ceae5b34b7320e8f0e2c02 + HEAD_REF master +) + +if("non-posix" IN_LIST FEATURES) + set(ENABLE_POSIX_API OFF) +else() + set(ENABLE_POSIX_API ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_POSIX_API=${ENABLE_POSIX_API} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + "#if defined(ONIGURUMA_EXPORT)" + "#if 0 // defined(ONIGURUMA_EXPORT)" + ) +else() + # oniguruma.h uses `\n` as line break. + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + "#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)" + "#if 0\n#if defined(_WIN32) && !defined(__GNUC__)" + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/opencsg/CMakeLists.txt b/ports/opencsg/CMakeLists.txt new file mode 100644 index 0000000000..683529ddcc --- /dev/null +++ b/ports/opencsg/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required (VERSION 3.4) +project (opencsg) + +set(HEADERS + include/opencsg.h +) + +set(SRCS + src/area.cpp + src/batch.cpp + src/context.cpp + src/channelManager.cpp + src/frameBufferObject.cpp + src/frameBufferObjectExt.cpp + src/occlusionQuery.cpp + src/opencsgRender.cpp + src/openglHelper.cpp + src/primitive.cpp + src/primitiveHelper.cpp + src/renderGoldfeather.cpp + src/renderSCS.cpp + src/scissorMemo.cpp + src/settings.cpp + src/stencilManager.cpp + src/pBufferTexture.cpp + RenderTexture/RenderTexture.cpp +) + + +add_library(opencsg ${SRCS} ${HEADERS}) + +include_directories(src include RenderTexture ".") +find_package(GLEW REQUIRED) +include_directories(${GLEW_INCLUDE_DIRS}) +target_link_libraries(opencsg PRIVATE GLEW::GLEW) + +install( + TARGETS opencsg + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/opencsg) +endif() diff --git a/ports/opencsg/CONTROL b/ports/opencsg/CONTROL new file mode 100644 index 0000000000..a2b5b0d7fe --- /dev/null +++ b/ports/opencsg/CONTROL @@ -0,0 +1,4 @@ +Source: opencsg +Version: 1.4.2 +Build-Depends: glew +Description: OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system. diff --git a/ports/opencsg/illegal_char.patch b/ports/opencsg/illegal_char.patch new file mode 100644 index 0000000000..5c700fd190 --- /dev/null +++ b/ports/opencsg/illegal_char.patch @@ -0,0 +1,13 @@ +diff --git a/include/opencsg.h b/include/opencsg.h +index d753a0e..b482c40 100644 +--- a/include/opencsg.h ++++ b/include/opencsg.h +@@ -156,7 +156,7 @@ namespace OpenCSG { + /// The DepthComplexityAlgorithm specifies the strategy for profiting + /// from depth complexity when performing the CSG rendering. + /// - NoDepthComplexitySampling: Does not employ the depth complexity. +- /// This essentially makes the algorithm O(n²), but with ++ /// This essentially makes the algorithm O(n²), but with + /// low constant costs. + /// - DepthComplexitySampling: Calculates the depth complexity k using + /// the stencil buffer. This makes algorithm O(n*k), but diff --git a/ports/opencsg/portfile.cmake b/ports/opencsg/portfile.cmake new file mode 100644 index 0000000000..e43a89ec55 --- /dev/null +++ b/ports/opencsg/portfile.cmake @@ -0,0 +1,39 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO floriankirsch/OpenCSG + REF "opencsg-1-4-2-release" + SHA512 df117a1b7153a95332d236918d1547b0afe6f3ead46af2733c5feee6e25cec984b21affc41fd8320a45be9292bd3b32e21ed8bb3d08371ddd657f659b9bb932a + HEAD_REF master + PATCHES illegal_char.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DUNICODE=1 -D_UNICODE=1 + # OPTIONS_RELEASE -DOPTIMIZE=1 + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencsg RENAME copyright) diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 4727d43701..03328915d7 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-5 +Version: 3.4.3-6 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 42ac28183d..49e42466a3 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -287,7 +287,7 @@ vcpkg_configure_cmake( ${BUILD_WITH_CONTRIB_FLAG} -DOPENCV_OTHER_INSTALL_PATH=share/opencv # WITH - -DWITH_CUBLAS=OFF + -DWITH_CUBLAS=${WITH_CUDA} -DWITH_CUDA=${WITH_CUDA} -DWITH_EIGEN=${WITH_EIGEN} -DWITH_FFMPEG=${WITH_FFMPEG} diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL index dd92faea54..a40b11c64c 100644 --- a/ports/opus/CONTROL +++ b/ports/opus/CONTROL @@ -1,3 +1,3 @@ Source: opus -Version: 1.3 +Version: 1.3-1 Description: Totally open, royalty-free, highly versatile audio codec diff --git a/ports/opus/package_version.in b/ports/opus/package_version.in new file mode 100644 index 0000000000..4bc971b335 --- /dev/null +++ b/ports/opus/package_version.in @@ -0,0 +1 @@ +PACKAGE_VERSION="@OPUS_VERSION@" diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index d15be61f1c..ae257690ca 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -3,6 +3,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) endif() include(vcpkg_common_functions) + +set(OPUS_VERSION "1.3") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus @@ -12,6 +15,11 @@ vcpkg_from_github( PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-main.patch" ) +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/package_version.in + ${SOURCE_PATH}/package_version +) + # Ensure proper crt linkage file(READ ${SOURCE_PATH}/win32/VS2015/common.props OPUS_PROPS) if(VCPKG_CRT_LINKAGE STREQUAL dynamic) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index c17ac83c23..b9f669186c 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.12.1-1 +Version: 5.12.1-2 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL new file mode 100644 index 0000000000..e8541a27d1 --- /dev/null +++ b/ports/stxxl/CONTROL @@ -0,0 +1,3 @@ +Source: stxxl +Version: 2018-11-15 +Description: Standard Template Library for Extra Large Data Sets diff --git a/ports/stxxl/fix-include-dir.patch b/ports/stxxl/fix-include-dir.patch new file mode 100644 index 0000000000..043252fb69 --- /dev/null +++ b/ports/stxxl/fix-include-dir.patch @@ -0,0 +1,31 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 06f9e50a..281e1f04 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -94,6 +94,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl SHARED ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +@@ -104,6 +106,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl_static STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl_static PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl_static PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl_static PUBLIC $) ++ + install(TARGETS stxxl_static + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) +@@ -122,6 +126,8 @@ else() + add_library(stxxl STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake new file mode 100644 index 0000000000..14d39d38e3 --- /dev/null +++ b/ports/stxxl/portfile.cmake @@ -0,0 +1,76 @@ +include(vcpkg_common_functions) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message("stxxl currently only supports static library linkage.") + set(VCPKG_LIBRARY_LINKAGE static) + set(VCPKG_CRT_LINKAGE static) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stxxl/stxxl + REF b9e44f0ecba7d7111fbb33f3330c3e53f2b75236 + SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 + HEAD_REF master + PATCHES + # This patch can be removed when stxxl/stxxl/#95 is accepted + fix-include-dir.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_STATIC_LIBS=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_EXTRAS=OFF + -DUSE_BOOST=OFF + -DTRY_COMPILE_HEADERS=OFF + -DUSE_STD_THREADS=ON + -DNO_CXX11=OFF + -DUSE_VALGRIND=OFF + -DUSE_MALLOC_COUNT=OFF + -DUSE_GCOV=OFF + -DUSE_TPIE=OFF + OPTIONS_DEBUG + -DSTXXL_DEBUG_ASSERTIONS=ON + OPTIONS_RELEASE + -DSTXXL_DEBUG_ASSERTIONS=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +endif() + +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake + "\${STXXL_CMAKE_DIR}/../include" + "\${STXXL_CMAKE_DIR}/../../include" +) + +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/bin +) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() diff --git a/ports/winpcap/Packet.vcxproj b/ports/winpcap/Packet.vcxproj new file mode 100644 index 0000000000..71e190caa5 --- /dev/null +++ b/ports/winpcap/Packet.vcxproj @@ -0,0 +1,768 @@ + + + + + Debug No NetMon + Win32 + + + Debug No NetMon + x64 + + + Debug NT4 + Win32 + + + Debug NT4 + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release LOG_TO_FILE + Win32 + + + Release LOG_TO_FILE + x64 + + + Release No NetMon LOG_TO_FILE + Win32 + + + Release No NetMon LOG_TO_FILE + x64 + + + Release No NetMon + Win32 + + + Release No NetMon + x64 + + + Release NT4 LOG_TO_FILE + Win32 + + + Release NT4 LOG_TO_FILE + x64 + + + Release NT4 + Win32 + + + Release NT4 + x64 + + + Release + Win32 + + + Release + x64 + + + + {17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52} + Packet + Win32Proj + + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + true + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/winpcap/fix-create-lib-batch.patch b/ports/winpcap/fix-create-lib-batch.patch new file mode 100644 index 0000000000..0a1d9017d0 --- /dev/null +++ b/ports/winpcap/fix-create-lib-batch.patch @@ -0,0 +1,23 @@ +diff --git a/create_lib.bat b/create_lib.bat +index c70a179..4690d9e 100644 +--- a/create_lib.bat ++++ b/create_lib.bat +@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) + echo Creating \Lib folder + mkdir %WPDPACKDESTDIR% >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\debug\ >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\x64\debug >nul 2>nul + +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64\debug\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul + diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 613a5733e4..964122d178 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_extract_source_archive_ex( "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" ) file( @@ -63,8 +64,14 @@ vcpkg_execute_required_process( LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY ${CURRENT_PORT_DIR}/Packet.vcxproj DESTINATION ${SOURCE_PATH}/packetNtx/Dll/Project/) +endif() + vcpkg_build_msbuild( PROJECT_PATH "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.sln" + RELEASE_CONFIGURATION "Release" + DEBUG_CONFIGURATION "Debug" PLATFORM ${PLATFORM} ) @@ -85,6 +92,10 @@ vcpkg_execute_required_process( LOGNAME upgrade-wpcap-${TARGET_TRIPLET} ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY ${CURRENT_PORT_DIR}/wpcap.vcxproj DESTINATION ${SOURCE_PATH}/wpcap/PRJ/) +endif() + vcpkg_build_msbuild( PROJECT_PATH "${SOURCE_PATH}/wpcap/PRJ/wpcap.sln" RELEASE_CONFIGURATION "Release - No AirPcap" @@ -147,8 +158,8 @@ file( file( INSTALL - "${PCAP_LIBRARY_PATH}/Packet.lib" - "${PCAP_LIBRARY_PATH}/wpcap.lib" + "${PCAP_LIBRARY_PATH}/debug/Packet.lib" + "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) diff --git a/ports/winpcap/wpcap.vcxproj b/ports/winpcap/wpcap.vcxproj new file mode 100644 index 0000000000..5740dec407 --- /dev/null +++ b/ports/winpcap/wpcap.vcxproj @@ -0,0 +1,396 @@ + + + + + Debug No AirPcap + Win32 + + + Debug No AirPcap + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release No AirPcap + Win32 + + + Release No AirPcap + x64 + + + Release + Win32 + + + Release + x64 + + + + {20B438DA-CBEC-4AFF-B11C-67B301D14AD5} + wpcap + Win32Proj + + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file