From a7975ab23f1b7ef4629c6ebd7b42090f967a9579 Mon Sep 17 00:00:00 2001 From: Rob French Date: Wed, 29 Apr 2020 23:24:27 -0500 Subject: [PATCH] Fixed broken setup.py... again... --- quisk.egg-info/SOURCES.txt | 12 ++++++++++++ setup.py | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/quisk.egg-info/SOURCES.txt b/quisk.egg-info/SOURCES.txt index 7abb055..e7ce9a1 100755 --- a/quisk.egg-info/SOURCES.txt +++ b/quisk.egg-info/SOURCES.txt @@ -7,6 +7,7 @@ WinQuisk.pyw WinQuiskVna.pyw __init__.py __main__.py +_quisk.pyd configure.py defaults.html docs.html @@ -18,6 +19,7 @@ filters.h filters.py freedv.c freedv.h +gpiokeyer.c help.html help_conf.html help_vna.html @@ -50,9 +52,11 @@ quisk_hardware_hamlib.py quisk_hardware_model.py quisk_hardware_sdr8600.py quisk_hardware_sdriq.py +quisk_hardware_sdrmicron.py quisk_utils.py quisk_vna.py quisk_widgets.py +setup.cfg setup.py softrock_tune_vfo.py sound.c @@ -68,6 +72,7 @@ winsound.txt ./README.txt ./__init__.py ./__main__.py +./_quisk.so ./configure.py ./defaults.html ./docs.html @@ -97,6 +102,7 @@ winsound.txt ./quisk_hardware_model.py ./quisk_hardware_sdr8600.py ./quisk_hardware_sdriq.py +./quisk_hardware_sdrmicron.py ./quisk_utils.py ./quisk_vna.py ./quisk_widgets.py @@ -106,6 +112,7 @@ winsound.txt ./afedrinet/SOURCE.txt ./afedrinet/__init__.py ./afedrinet/afedri.py +./afedrinet/afedrinet_io.so ./afedrinet/quisk_conf.py ./afedrinet/quisk_conf_linux.py ./afedrinet/quisk_conf_mac.py @@ -156,6 +163,7 @@ winsound.txt ./sdriqpkg/README.txt ./sdriqpkg/__init__.py ./sdriqpkg/quisk_hardware.py +./sdriqpkg/sdriq.so ./sdrmicronpkg/__init__.py ./sdrmicronpkg/quisk_hardware.py ./soapypkg/__init__.py @@ -172,11 +180,14 @@ winsound.txt ./softrock/widgets_tx.py afedrinet/SOURCE.txt afedrinet/__init__.py +afedrinet/af_comp.bat afedrinet/af_comp.bat.makeit afedrinet/afe_library afedrinet/afe_library.mac afedrinet/afedri.py afedrinet/afedrinet_io.c +afedrinet/afedrinet_io.pyd +afedrinet/afedrinet_io.so afedrinet/quisk_conf.py afedrinet/quisk_conf_linux.py afedrinet/quisk_conf_mac.py @@ -239,6 +250,7 @@ sdriqpkg/quisk_hardware.py sdriqpkg/sdriq.c sdriqpkg/sdriq.h sdriqpkg/sdriq.pyd +sdriqpkg/sdriq.so sdrmicronpkg/__init__.py sdrmicronpkg/quisk_hardware.py soapypkg/__init__.py diff --git a/setup.py b/setup.py index 947e725..42fcd38 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,8 @@ is_64bit = struct.calcsize("P") == 8 have_portaudio = False -# KC4UPR: Added some lists to grab extra sources and macros. +# KC4UPR: Added some lists to grab extra libraries, sources and macros. +extra_libraries = [] extra_sources = [] extra_macros = [] @@ -40,10 +41,12 @@ if sys.platform != "win32": if not os.path.isfile("/usr/include/wiringPi.h"): print("No wiringPi.h available--not building GPIO Keyer") else: + extra_libraries.append('wiringPi') extra_sources.append('gpiokeyer.c') extra_macros.append(('ENABLE_GPIO_KEYER', '1')) -libraries = ['asound', 'pulse', 'fftw3', 'm'] +# KC4UPR: added suffix '+ extra...' to pull in extra items +libraries = ['asound', 'pulse', 'fftw3', 'm'] + extra_libraries sources = ['quisk.c', 'sound.c', 'sound_alsa.c', 'sound_pulseaudio.c', 'is_key_down.c', 'microphone.c', 'utility.c', 'filter.c', 'extdemod.c', 'freedv.c'] + extra_sources