From d4888c5f6571c6971a98722ba0df4995b9b53eda Mon Sep 17 00:00:00 2001 From: Ihor Dutchak Date: Wed, 22 Sep 2021 13:30:23 +0300 Subject: [PATCH] Remove DDK support files. (#333) Deleted DDK build scripts, support files and documentation for it, as it wasn't working of-the-box with recent tool-sets from MS anyway. Still keeping `HIDAPI_USE_DDK` macro in the code, as it still _can_ be used if the build configuration is setup properly. Resolves: #49 --- BUILD.md | 18 ++----------- windows/Makefile.am | 1 - windows/ddk_build/.gitignore | 2 -- windows/ddk_build/hidapi.def | 18 ------------- windows/ddk_build/makefile | 49 ------------------------------------ windows/ddk_build/sources | 23 ----------------- 6 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 windows/ddk_build/.gitignore delete mode 100644 windows/ddk_build/hidapi.def delete mode 100644 windows/ddk_build/makefile delete mode 100644 windows/ddk_build/sources diff --git a/BUILD.md b/BUILD.md index 47cbe48..b78e82f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -106,19 +106,5 @@ To build HIDAPI using MinGW or Cygwin using Autotools, use a general Autotools Any windows builds (MSVC or MinGW/Cygwin) are also supported by [CMake](BUILD.cmake.md). -HIDAPI can also be built using the Windows DDK (now also called the Windows -Driver Kit or WDK). This method was originally required for the HIDAPI build -but not anymore. However, some users still prefer this method. It is not as -well supported anymore but should still work. Patches are welcome if it does -not. To build using the DDK: - - 1. Install the Windows Driver Kit (WDK) from Microsoft. - 2. From the Start menu, in the Windows Driver Kits folder, select Build - Environments, then your operating system, then the x86 Free Build - Environment (or one that is appropriate for your system). - 3. From the console, change directory to the `windows/ddk_build/` directory, - which is part of the HIDAPI distribution. - 4. Type build. - 5. You can find the output files (DLL and LIB) in a subdirectory created - by the build system which is appropriate for your environment. On - Windows XP, this directory is `objfre_wxp_x86/i386`. +If you are looking for information regarding DDK build of HIDAPI +- the build has been broken for a while and now the support files are obsolete. diff --git a/windows/Makefile.am b/windows/Makefile.am index 97e261a..2ea5c0d 100644 --- a/windows/Makefile.am +++ b/windows/Makefile.am @@ -8,7 +8,6 @@ hdrdir = $(includedir)/hidapi hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h EXTRA_DIST = \ - ddk_build \ hidapi.vcproj \ hidtest.vcproj \ Makefile-manual \ diff --git a/windows/ddk_build/.gitignore b/windows/ddk_build/.gitignore deleted file mode 100644 index 823ff0b..0000000 --- a/windows/ddk_build/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.log -obj*_*_* \ No newline at end of file diff --git a/windows/ddk_build/hidapi.def b/windows/ddk_build/hidapi.def deleted file mode 100644 index 01fe47d..0000000 --- a/windows/ddk_build/hidapi.def +++ /dev/null @@ -1,18 +0,0 @@ -LIBRARY hidapi -EXPORTS - hid_open @1 - hid_write @2 - hid_read @3 - hid_close @4 - hid_get_product_string @5 - hid_get_manufacturer_string @6 - hid_get_serial_number_string @7 - hid_get_indexed_string @8 - hid_error @9 - hid_set_nonblocking @10 - hid_enumerate @11 - hid_open_path @12 - hid_send_feature_report @13 - hid_get_feature_report @14 - hid_get_input_report @15 - \ No newline at end of file diff --git a/windows/ddk_build/makefile b/windows/ddk_build/makefile deleted file mode 100644 index 637f712..0000000 --- a/windows/ddk_build/makefile +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################# -# -# Copyright (C) Microsoft Corporation 1995, 1996 -# All Rights Reserved. -# -# MAKEFILE for HID directory -# -############################################################################# - -!IFDEF WIN95_BUILD - -ROOT=..\..\..\.. - -VERSIONLIST = debug retail -IS_32 = TRUE -IS_SDK = TRUE -IS_PRIVATE = TRUE -IS_SDK = TRUE -IS_DDK = TRUE -WIN32 = TRUE -COMMONMKFILE = hidapi.mk - -!include $(ROOT)\dev\master.mk - - -!ELSE - -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!IF DEFINED(_NT_TARGET_VERSION) -! IF $(_NT_TARGET_VERSION)>=0x501 -! INCLUDE $(NTMAKEENV)\makefile.def -! ELSE -# Only warn once per directory -! INCLUDE $(NTMAKEENV)\makefile.plt -! IF "$(BUILD_PASS)"=="PASS1" -! message BUILDMSG: Warning : The sample "$(MAKEDIR)" is not valid for the current OS target. -! ENDIF -! ENDIF -!ELSE -! INCLUDE $(NTMAKEENV)\makefile.def -!ENDIF - -!ENDIF - diff --git a/windows/ddk_build/sources b/windows/ddk_build/sources deleted file mode 100644 index 7f06a09..0000000 --- a/windows/ddk_build/sources +++ /dev/null @@ -1,23 +0,0 @@ -TARGETNAME=hidapi -TARGETTYPE=DYNLINK -UMTYPE=console -UMENTRY=main - -MSC_WARNING_LEVEL=/W3 /WX - -TARGETLIBS=$(SDK_LIB_PATH)\hid.lib \ - $(SDK_LIB_PATH)\setupapi.lib \ - $(SDK_LIB_PATH)\kernel32.lib \ - $(SDK_LIB_PATH)\comdlg32.lib - -USE_MSVCRT=1 - -INCLUDES= ..\..\hidapi -SOURCES= ..\hid.c \ - - -TARGET_DESTINATION=retail - -MUI=0 -MUI_COMMENT="HID Interface DLL" -