From d69bb06db857553dc2bf1cad58aa3c742acfe1e8 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 25 Jun 2020 13:15:55 +0200 Subject: Build: remove unused lapack/hidapi/mingw32 build infrastructure Ref T76184 --- build_files/build_environment/CMakeLists.txt | 8 +- build_files/build_environment/cmake/harvest.cmake | 2 - build_files/build_environment/cmake/hidapi.cmake | 29 --- build_files/build_environment/cmake/options.cmake | 23 +-- .../build_environment/cmake/setup_mingw32.cmake | 227 --------------------- .../build_environment/cmake/setup_mingw64.cmake | 2 +- build_files/build_environment/cmake/versions.cmake | 4 - .../patches/cmakelists_hidapi.txt | 20 -- build_files/build_environment/patches/hidapi.diff | 15 -- 9 files changed, 8 insertions(+), 322 deletions(-) delete mode 100644 build_files/build_environment/cmake/hidapi.cmake delete mode 100644 build_files/build_environment/cmake/setup_mingw32.cmake delete mode 100644 build_files/build_environment/patches/cmakelists_hidapi.txt delete mode 100644 build_files/build_environment/patches/hidapi.diff (limited to 'build_files/build_environment') diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 0badc526c07..1f041babcd7 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -48,11 +48,7 @@ include(cmake/options.cmake) include(cmake/versions.cmake) if(ENABLE_MINGW64) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - include(cmake/setup_mingw64.cmake) - else() - include(cmake/setup_mingw32.cmake) - endif() + include(cmake/setup_mingw64.cmake) else() set(mingw_LIBDIR ${LIBDIR}) endif() @@ -107,8 +103,6 @@ if(WITH_WEBP) endif() if(WIN32) - # HMD branch deps - include(cmake/hidapi.cmake) # OCIO deps include(cmake/tinyxml.cmake) include(cmake/yamlcpp.cmake) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index a7685f87c8d..33b7f9db192 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -43,8 +43,6 @@ if(BUILD_MODE STREQUAL Release) # tiff ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ && - # hidapi - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ DEPENDS ) endif() diff --git a/build_files/build_environment/cmake/hidapi.cmake b/build_files/build_environment/cmake/hidapi.cmake deleted file mode 100644 index 9a3d2ebf8df..00000000000 --- a/build_files/build_environment/cmake/hidapi.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ***** END GPL LICENSE BLOCK ***** - -set(HIDAPI_EXTRA_ARGS) - -ExternalProject_Add(external_hidapi - URL ${HIDAPI_URI} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${HIDAPI_HASH} - PREFIX ${BUILD_DIR}/hidapi - PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt ${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS} - INSTALL_DIR ${LIBDIR}/hidapi -) diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index ed82f1fd9ee..4b973067020 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -17,7 +17,7 @@ # ***** END GPL LICENSE BLOCK ***** if(WIN32) - option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON) + option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON) endif() option(WITH_WEBP "Enable building of oiio with webp support" OFF) set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with") @@ -45,11 +45,7 @@ message("PATCH_DIR = ${PATCH_DIR}") message("BUILD_DIR = ${BUILD_DIR}") if(WIN32) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe) - else() - set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe) - endif() + set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe) set(LIBEXT ".lib") set(LIBPREFIX "") @@ -82,17 +78,10 @@ if(WIN32) set(PLATFORM_CXX_FLAGS) set(PLATFORM_CMAKE_FLAGS) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64) - set(MINGW_SHELL ming64sh.cmd) - set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat) - set(MINGW_HOST x86_64-w64-mingw32) - else() - set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32) - set(MINGW_SHELL ming32sh.cmd) - set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat) - set(MINGW_HOST i686-w64-mingw32) - endif() + set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64) + set(MINGW_SHELL ming64sh.cmd) + set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat) + set(MINGW_HOST x86_64-w64-mingw32) set(CONFIGURE_ENV cd ${MINGW_PATH} && diff --git a/build_files/build_environment/cmake/setup_mingw32.cmake b/build_files/build_environment/cmake/setup_mingw32.cmake deleted file mode 100644 index c9fbe301ac7..00000000000 --- a/build_files/build_environment/cmake/setup_mingw32.cmake +++ /dev/null @@ -1,227 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ***** END GPL LICENSE BLOCK ***** - -#################################################################################################################### -# Mingw32 Builds -#################################################################################################################### -# This installs mingw32+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3 -#################################################################################################################### - -message("LIBDIR = ${LIBDIR}") -macro(cmake_to_msys_path MsysPath ResultingPath) - string(REPLACE ":" "" TmpPath "${MsysPath}") - string(SUBSTRING ${TmpPath} 0 1 Drive) - string(SUBSTRING ${TmpPath} 1 255 PathPart) - string(TOLOWER ${Drive} LowerDrive) - string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart}) -endmacro() -cmake_to_msys_path(${LIBDIR} mingw_LIBDIR) -message("mingw_LIBDIR = ${mingw_LIBDIR}") - -message("Checking for mingw32") -# download mingw32 -if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z") - message("Downloading mingw32") - file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z") -endif() - -# make mingw root directory -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw") - execute_process( - COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw - WORKING_DIRECTORY ${DOWNLOAD_DIR} - ) -endif() - -# extract mingw32 -if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")) - message("Extracting mingw32") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z - WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw - ) -endif() - -message("Checking for pkg-config") -if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip") - message("Downloading pkg-config") - file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip") -endif() - -# extract pkgconfig -if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")) - message("Extracting pkg-config") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip" - WORKING_DIRECTORY ${DOWNLOAD_DIR}/ - ) - - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe" - ) - -endif() - -message("Checking for nasm") -if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip") - message("Downloading nasm") - file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip") -endif() - -# extract nasm -if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")) - message("Extracting nasm") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip" - WORKING_DIRECTORY ${DOWNLOAD_DIR}/ - ) - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe" - ) - -endif() -SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe) -message("Checking for mingwGet") -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip") - message("Downloading mingw-get") - file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip") -endif() - -# extract mingw_get -if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")) - message("Extracting mingw-get") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" - WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/ - ) -endif() - -if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe")) - message("Installing MSYS") - execute_process( - COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch - WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/bin/ - ) -endif() - -if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe")) - message("Installing mktemp") - execute_process( - COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp - WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/bin/ - ) -endif() - - -message("Checking for CoreUtils") -# download old core_utils for pr.exe (ffmpeg needs it to build) -if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") - message("Downloading CoreUtils 5.97") - file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") -endif() - -if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe")) - message("Installing pr from CoreUtils 5.97") - execute_process( - COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils - WORKING_DIRECTORY ${DOWNLOAD_DIR} - ) - - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2 - WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/ - ) - - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe" - WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/ - ) -endif() - -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") - message("Installing ming32sh.cmd") - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd - ) -endif() - -message("Checking for perl") -# download perl for libvpx -if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip") - message("Downloading perl") - file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip") -endif() - -# make perl root directory -if(NOT EXISTS "${DOWNLOAD_DIR}/perl32") - execute_process( - COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32 - WORKING_DIRECTORY ${DOWNLOAD_DIR} - ) -endif() - -# extract perl -if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")) - message("Extracting perl") - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip - WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32 - ) -endif() - -# get yasm for vpx -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe") - message("Downloading yasm") - file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe") -endif() - -message("checking i686-w64-mingw32-strings") -# copy strings.exe to i686-w64-mingw32-strings for x264 -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe") - message("fixing i686-w64-mingw32-strings.exe") - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe" - ) -endif() - -message("checking i686-w64-mingw32-ar.exe") -# copy ar.exe to i686-w64-mingw32-ar.exe for x264 -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe") - message("fixing i686-w64-mingw32-ar.exe") - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe" - ) -endif() - -message("checking i686-w64-mingw32-strip.exe") -# copy strip.exe to i686-w64-mingw32-strip.exe for x264 -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe") - message("fixing i686-w64-mingw32-strip.exe") - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe" - ) -endif() - -message("checking i686-w64-mingw32-ranlib.exe") -# copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264 -if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe") - message("fixing i686-w64-mingw32-ranlib.exe") - execute_process( - COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe" - ) -endif() diff --git a/build_files/build_environment/cmake/setup_mingw64.cmake b/build_files/build_environment/cmake/setup_mingw64.cmake index bfffbe7770f..e370da049d5 100644 --- a/build_files/build_environment/cmake/setup_mingw64.cmake +++ b/build_files/build_environment/cmake/setup_mingw64.cmake @@ -19,7 +19,7 @@ #################################################################################################################### # Mingw64 Builds #################################################################################################################### -# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/lapack/fftw3 +# This installs mingw64+msys to compile ffmpeg/iconv/libsndfile/fftw3 #################################################################################################################### message("LIBDIR = ${LIBDIR}") diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d42102c4374..5ec5553079c 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -212,10 +212,6 @@ set(ICONV_VERSION 1.16) set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz) set(ICONV_HASH 7d2a800b952942bb2880efb00cfd524c) -set(LAPACK_VERSION 3.6.0) -set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz) -set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101) - set(SNDFILE_VERSION 1.0.28) set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz) set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c) diff --git a/build_files/build_environment/patches/cmakelists_hidapi.txt b/build_files/build_environment/patches/cmakelists_hidapi.txt deleted file mode 100644 index 239b9d88b16..00000000000 --- a/build_files/build_environment/patches/cmakelists_hidapi.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(hidapi) - -set(SRC_FILES - windows/hid.c -) - -set(HEADER_FILES - hidapi/hidapi.h -) -include_directories(hidapi) -add_definitions(-DHID_API_STATIC) -add_library(hidapi STATIC ${SRC_FILES} ${HEADER_FILES}) - -install(TARGETS hidapi DESTINATION lib) - -INSTALL(FILES hidapi/hidapi.h - DESTINATION "include" - ) - diff --git a/build_files/build_environment/patches/hidapi.diff b/build_files/build_environment/patches/hidapi.diff deleted file mode 100644 index 720a8ae5ae9..00000000000 --- a/build_files/build_environment/patches/hidapi.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- hidapi/hidapi.h 2011-10-25 20:58:16 -0600 -+++ hidapi/hidapi.h 2016-11-01 12:05:58 -0600 -@@ -30,7 +30,11 @@ - #include - - #ifdef _WIN32 -- #define HID_API_EXPORT __declspec(dllexport) -+ #ifdef HID_API_STATIC -+ #define HID_API_EXPORT -+ #else -+ #define HID_API_EXPORT __declspec(dllexport) -+ #endif - #define HID_API_CALL - #else - #define HID_API_EXPORT /**< API export macro */ -- cgit v1.2.3