Skip to content

Commit 4ea253f

Browse files
authored
Merge pull request #60 from davidgfnet/master
Upgrade libusb from 0.x to 1.0
2 parents 32f2fa9 + 403aade commit 4ea253f

File tree

3 files changed

+179
-192
lines changed

3 files changed

+179
-192
lines changed

.github/workflows/compilation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Install dependencies
1717
run: |
18-
apk add build-base linux-headers readline-dev libusb-compat-dev
18+
apk add build-base linux-headers readline-dev libusb-dev
1919
2020
- name: Compile project
2121
run: |
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Cygwin
4141
uses: egor-tensin/setup-cygwin@v4
4242
with:
43-
packages: gcc-core gcc-g++ make libreadline7 libreadline-devel libusb0 libusb-devel libncursesw10
43+
packages: gcc-core gcc-g++ make libreadline8 libreadline-devel libusb1.0 libusb1.0-devel libncursesw10
4444

4545
- name: Compile project
4646
run: |
@@ -52,8 +52,8 @@ jobs:
5252
cp C:\tools\cygwin\bin\cygwin1.dll build
5353
cp C:\tools\cygwin\bin\cygstdc++-6.dll build
5454
cp C:\tools\cygwin\bin\cyggcc_s-seh-1.dll build
55-
cp C:\tools\cygwin\bin\cygreadline7.dll build
56-
cp C:\tools\cygwin\bin\cygusb0.dll build
55+
cp C:\tools\cygwin\bin\cygreadline8.dll build
56+
cp C:\tools\cygwin\bin\cygusb-1.0.dll build
5757
cp C:\tools\cygwin\bin\cygncursesw-10.dll build
5858
5959
- name: Upload artifacts

usbhostfs_pc/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
OUTPUT=usbhostfs_pc
22
OBJS=main.o
3-
LIBS=-lusb -lpthread
4-
CFLAGS=-Wall -ggdb -I../usbhostfs -DPC_SIDE -D_FILE_OFFSET_BITS=64 -I. -O2 $(shell pkg-config --cflags libusb)
5-
LDFLAGS=-L. $(shell pkg-config --libs libusb)
3+
LIBS=-lpthread $(shell pkg-config --libs libusb-1.0)
4+
CFLAGS=-Wall -ggdb -I../usbhostfs -DPC_SIDE -D_FILE_OFFSET_BITS=64 -I. -O2 $(shell pkg-config --cflags libusb-1.0)
5+
LDFLAGS=
66

77
PREFIX=$(shell psp-config --pspdev-path 2> /dev/null)
88

0 commit comments

Comments
 (0)