Skip to content

Commit

Permalink
Ported code from SetupApi to CfgMgr32 (#362)
Browse files Browse the repository at this point in the history
  • Loading branch information
DJm00n authored Jan 21, 2022
1 parent 31bde69 commit fe9a2a2
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 187 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ if test "x$os" = xwindows; then
AC_DEFINE(OS_WINDOWS, 1, [Windows implementations])
AC_SUBST(OS_WINDOWS)
LDFLAGS="${LDFLAGS} -no-undefined"
LIBS="${LIBS} -lsetupapi"
LIBS="${LIBS}"
fi

if test "x$threads" = xpthreads; then
Expand Down
2 changes: 1 addition & 1 deletion testgui/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COBJS=../windows/hid.o
CPPOBJS=test.o
OBJS=$(COBJS) $(CPPOBJS)
CFLAGS=-I../hidapi -I../../hidapi-externals/fox/include -g -c
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
LIBS= -mwindows -L../../hidapi-externals/fox/lib -Wl,-Bstatic -lFOX-1.6 -Wl,-Bdynamic -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32


hidapi-testgui: $(OBJS)
Expand Down
4 changes: 2 additions & 2 deletions testgui/testgui.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="setupapi.lib fox-1.6.lib"
AdditionalDependencies="fox-1.6.lib"
OutputFile="$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"
Expand Down Expand Up @@ -139,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="setupapi.lib fox-1.6.lib"
AdditionalDependencies="fox-1.6.lib"
OutputFile="$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"
Expand Down
1 change: 0 additions & 1 deletion windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ add_library(hidapi_winapi
)
target_link_libraries(hidapi_winapi
PUBLIC hidapi_include
PRIVATE setupapi
)

set_target_properties(hidapi_winapi
Expand Down
4 changes: 2 additions & 2 deletions windows/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ CC=gcc
COBJS=hid.o ../hidtest/test.o
OBJS=$(COBJS)
CFLAGS=-I../hidapi -g -c
LIBS= -lsetupapi
DLL_LDFLAGS = -mwindows -lsetupapi
LIBS=
DLL_LDFLAGS = -mwindows

hidtest: $(OBJS)
$(CC) -g $^ $(LIBS) -o hidtest
Expand Down
Loading

0 comments on commit fe9a2a2

Please sign in to comment.