mirror of https://github.com/xemu-project/xemu.git
Merge 5bbf3027ac
into 8667193001
This commit is contained in:
commit
78f65b7681
|
@ -221,7 +221,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
sudo apt-get -qy update
|
sudo apt-get -qy update
|
||||||
sudo apt-get install ccache libfuse2
|
sudo apt-get install ccache libfuse2 libusb-1.0-0-dev
|
||||||
pushd src
|
pushd src
|
||||||
sudo apt-get -qy build-dep .
|
sudo apt-get -qy build-dep .
|
||||||
- name: Compile
|
- name: Compile
|
||||||
|
|
|
@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 11),
|
||||||
libpcap-dev,
|
libpcap-dev,
|
||||||
libslirp-dev,
|
libslirp-dev,
|
||||||
libvulkan-dev,
|
libvulkan-dev,
|
||||||
|
libusb-1.0-0-dev,
|
||||||
libcurl4-gnutls-dev,
|
libcurl4-gnutls-dev,
|
||||||
Standards-Version: 3.9.8
|
Standards-Version: 3.9.8
|
||||||
Homepage: https://xemu.app
|
Homepage: https://xemu.app
|
||||||
|
|
|
@ -2158,7 +2158,7 @@ if not get_option('usb_redir').auto() or have_system
|
||||||
endif
|
endif
|
||||||
libusb = not_found
|
libusb = not_found
|
||||||
if not get_option('libusb').auto() or have_system
|
if not get_option('libusb').auto() or have_system
|
||||||
libusb = dependency('libusb-1.0', required: get_option('libusb'),
|
libusb = dependency('libusb-1.0', required: get_option('libusb').enabled(),
|
||||||
version: '>=1.0.13', method: 'pkg-config')
|
version: '>=1.0.13', method: 'pkg-config')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -187,7 +187,8 @@ def main():
|
||||||
'libpixman',
|
'libpixman',
|
||||||
'libepoxy',
|
'libepoxy',
|
||||||
'libpcap',
|
'libpcap',
|
||||||
'libslirp'])
|
'libslirp',
|
||||||
|
'libusb'])
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
|
@ -92,6 +92,7 @@ RUN make \
|
||||||
-C ${MXE_PATH} \
|
-C ${MXE_PATH} \
|
||||||
glib \
|
glib \
|
||||||
libepoxy \
|
libepoxy \
|
||||||
|
libusb1 \
|
||||||
pixman \
|
pixman \
|
||||||
libsamplerate \
|
libsamplerate \
|
||||||
libressl \
|
libressl \
|
||||||
|
|
Loading…
Reference in New Issue