Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port usbhostfs_pc to libusb-1.0 #16

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Port usbhostfs_pc to libusb-1.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6978b6
Port to libusb-1.0
sharkwouter Sep 30, 2021
74a22c5
Replace Windows libusb library with 1.0 version
sharkwouter Oct 14, 2021
80d19bf
Delete windows directory
sharkwouter Apr 4, 2022
60fe7ca
Merge branch 'pspdev:master' into libusb-1.0
sharkwouter Apr 4, 2022
e9853ad
Update libusb version in automated windows build
sharkwouter Apr 4, 2022
b7d19a5
Copy correct libusb dll to Windows artifact
sharkwouter Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/compilation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: egor-tensin/setup-cygwin@v3
with:
platform: x64
packages: gcc-core gcc-g++ make libreadline7 libreadline-devel libncursesw10 libncurses-devel libusb0 libusb-devel
packages: gcc-core gcc-g++ make libreadline7 libreadline-devel libncursesw10 libncurses-devel libusb1.0 libusb1.0-devel

- name: Compile project
run: |
Expand All @@ -54,7 +54,7 @@ jobs:
cp C:\tools\cygwin\bin\cygstdc++-6.dll build
cp C:\tools\cygwin\bin\cyggcc_s-seh-1.dll build
cp C:\tools\cygwin\bin\cygreadline7.dll build
cp C:\tools\cygwin\bin\cygusb0.dll build
cp C:\tools\cygwin\bin\cygusb-1.0.dll build
cp C:\tools\cygwin\bin\cygncursesw-10.dll build

- name: Upload artifacts
Expand Down
4 changes: 2 additions & 2 deletions usbhostfs_pc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OUTPUT=usbhostfs_pc
OBJS=main.o
LIBS=-lusb -lpthread
CFLAGS=-Wall -ggdb -I../usbhostfs -DPC_SIDE -D_FILE_OFFSET_BITS=64 -I. -O2
LIBS=-lusb-1.0 -lpthread
CFLAGS=-Wall -ggdb -I../usbhostfs -DPC_SIDE -D_FILE_OFFSET_BITS=64 -I. -I/usr/include/libusb-1.0 -O2
LDFLAGS=-L.

PREFIX=$(shell psp-config --pspdev-path 2> /dev/null)
Expand Down
Loading