Skip to content

Commit fe9a2a2

Browse files
authored
Ported code from SetupApi to CfgMgr32 (signal11#362)
- https://docs.microsoft.com/windows-hardware/drivers/install/porting-from-setupapi-to-cfgmgr32 - Use Unicode Windows API internally where possible.
1 parent 31bde69 commit fe9a2a2

File tree

8 files changed

+142
-187
lines changed

8 files changed

+142
-187
lines changed

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if test "x$os" = xwindows; then
153153
AC_DEFINE(OS_WINDOWS, 1, [Windows implementations])
154154
AC_SUBST(OS_WINDOWS)
155155
LDFLAGS="${LDFLAGS} -no-undefined"
156-
LIBS="${LIBS} -lsetupapi"
156+
LIBS="${LIBS}"
157157
fi
158158

159159
if test "x$threads" = xpthreads; then

testgui/Makefile.mingw

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COBJS=../windows/hid.o
1414
CPPOBJS=test.o
1515
OBJS=$(COBJS) $(CPPOBJS)
1616
CFLAGS=-I../hidapi -I../../hidapi-externals/fox/include -g -c
17-
LIBS= -mwindows -lsetupapi -L../../hidapi-externals/fox/lib -Wl,-Bstatic -lFOX-1.6 -Wl,-Bdynamic -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32
17+
LIBS= -mwindows -L../../hidapi-externals/fox/lib -Wl,-Bstatic -lFOX-1.6 -Wl,-Bdynamic -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32
1818

1919

2020
hidapi-testgui: $(OBJS)

testgui/testgui.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/>
6262
<Tool
6363
Name="VCLinkerTool"
64-
AdditionalDependencies="setupapi.lib fox-1.6.lib"
64+
AdditionalDependencies="fox-1.6.lib"
6565
OutputFile="$(ProjectName).exe"
6666
LinkIncremental="2"
6767
AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"
@@ -139,7 +139,7 @@
139139
/>
140140
<Tool
141141
Name="VCLinkerTool"
142-
AdditionalDependencies="setupapi.lib fox-1.6.lib"
142+
AdditionalDependencies="fox-1.6.lib"
143143
OutputFile="$(ProjectName).exe"
144144
LinkIncremental="1"
145145
AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"

windows/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ add_library(hidapi_winapi
44
)
55
target_link_libraries(hidapi_winapi
66
PUBLIC hidapi_include
7-
PRIVATE setupapi
87
)
98

109
set_target_properties(hidapi_winapi

windows/Makefile.mingw

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ CC=gcc
1212
COBJS=hid.o ../hidtest/test.o
1313
OBJS=$(COBJS)
1414
CFLAGS=-I../hidapi -g -c
15-
LIBS= -lsetupapi
16-
DLL_LDFLAGS = -mwindows -lsetupapi
15+
LIBS=
16+
DLL_LDFLAGS = -mwindows
1717

1818
hidtest: $(OBJS)
1919
$(CC) -g $^ $(LIBS) -o hidtest

0 commit comments

Comments
 (0)