Fixed broken setup.py... again...

This commit is contained in:
Rob French 2020-04-29 23:24:27 -05:00
parent 2252cded4c
commit a7975ab23f
2 changed files with 17 additions and 2 deletions

View File

@ -7,6 +7,7 @@ WinQuisk.pyw
WinQuiskVna.pyw WinQuiskVna.pyw
__init__.py __init__.py
__main__.py __main__.py
_quisk.pyd
configure.py configure.py
defaults.html defaults.html
docs.html docs.html
@ -18,6 +19,7 @@ filters.h
filters.py filters.py
freedv.c freedv.c
freedv.h freedv.h
gpiokeyer.c
help.html help.html
help_conf.html help_conf.html
help_vna.html help_vna.html
@ -50,9 +52,11 @@ quisk_hardware_hamlib.py
quisk_hardware_model.py quisk_hardware_model.py
quisk_hardware_sdr8600.py quisk_hardware_sdr8600.py
quisk_hardware_sdriq.py quisk_hardware_sdriq.py
quisk_hardware_sdrmicron.py
quisk_utils.py quisk_utils.py
quisk_vna.py quisk_vna.py
quisk_widgets.py quisk_widgets.py
setup.cfg
setup.py setup.py
softrock_tune_vfo.py softrock_tune_vfo.py
sound.c sound.c
@ -68,6 +72,7 @@ winsound.txt
./README.txt ./README.txt
./__init__.py ./__init__.py
./__main__.py ./__main__.py
./_quisk.so
./configure.py ./configure.py
./defaults.html ./defaults.html
./docs.html ./docs.html
@ -97,6 +102,7 @@ winsound.txt
./quisk_hardware_model.py ./quisk_hardware_model.py
./quisk_hardware_sdr8600.py ./quisk_hardware_sdr8600.py
./quisk_hardware_sdriq.py ./quisk_hardware_sdriq.py
./quisk_hardware_sdrmicron.py
./quisk_utils.py ./quisk_utils.py
./quisk_vna.py ./quisk_vna.py
./quisk_widgets.py ./quisk_widgets.py
@ -106,6 +112,7 @@ winsound.txt
./afedrinet/SOURCE.txt ./afedrinet/SOURCE.txt
./afedrinet/__init__.py ./afedrinet/__init__.py
./afedrinet/afedri.py ./afedrinet/afedri.py
./afedrinet/afedrinet_io.so
./afedrinet/quisk_conf.py ./afedrinet/quisk_conf.py
./afedrinet/quisk_conf_linux.py ./afedrinet/quisk_conf_linux.py
./afedrinet/quisk_conf_mac.py ./afedrinet/quisk_conf_mac.py
@ -156,6 +163,7 @@ winsound.txt
./sdriqpkg/README.txt ./sdriqpkg/README.txt
./sdriqpkg/__init__.py ./sdriqpkg/__init__.py
./sdriqpkg/quisk_hardware.py ./sdriqpkg/quisk_hardware.py
./sdriqpkg/sdriq.so
./sdrmicronpkg/__init__.py ./sdrmicronpkg/__init__.py
./sdrmicronpkg/quisk_hardware.py ./sdrmicronpkg/quisk_hardware.py
./soapypkg/__init__.py ./soapypkg/__init__.py
@ -172,11 +180,14 @@ winsound.txt
./softrock/widgets_tx.py ./softrock/widgets_tx.py
afedrinet/SOURCE.txt afedrinet/SOURCE.txt
afedrinet/__init__.py afedrinet/__init__.py
afedrinet/af_comp.bat
afedrinet/af_comp.bat.makeit afedrinet/af_comp.bat.makeit
afedrinet/afe_library afedrinet/afe_library
afedrinet/afe_library.mac afedrinet/afe_library.mac
afedrinet/afedri.py afedrinet/afedri.py
afedrinet/afedrinet_io.c afedrinet/afedrinet_io.c
afedrinet/afedrinet_io.pyd
afedrinet/afedrinet_io.so
afedrinet/quisk_conf.py afedrinet/quisk_conf.py
afedrinet/quisk_conf_linux.py afedrinet/quisk_conf_linux.py
afedrinet/quisk_conf_mac.py afedrinet/quisk_conf_mac.py
@ -239,6 +250,7 @@ sdriqpkg/quisk_hardware.py
sdriqpkg/sdriq.c sdriqpkg/sdriq.c
sdriqpkg/sdriq.h sdriqpkg/sdriq.h
sdriqpkg/sdriq.pyd sdriqpkg/sdriq.pyd
sdriqpkg/sdriq.so
sdrmicronpkg/__init__.py sdrmicronpkg/__init__.py
sdrmicronpkg/quisk_hardware.py sdrmicronpkg/quisk_hardware.py
soapypkg/__init__.py soapypkg/__init__.py

View File

@ -18,7 +18,8 @@ is_64bit = struct.calcsize("P") == 8
have_portaudio = False 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_sources = []
extra_macros = [] extra_macros = []
@ -40,10 +41,12 @@ if sys.platform != "win32":
if not os.path.isfile("/usr/include/wiringPi.h"): if not os.path.isfile("/usr/include/wiringPi.h"):
print("No wiringPi.h available--not building GPIO Keyer") print("No wiringPi.h available--not building GPIO Keyer")
else: else:
extra_libraries.append('wiringPi')
extra_sources.append('gpiokeyer.c') extra_sources.append('gpiokeyer.c')
extra_macros.append(('ENABLE_GPIO_KEYER', '1')) 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', sources = ['quisk.c', 'sound.c', 'sound_alsa.c', 'sound_pulseaudio.c',
'is_key_down.c', 'microphone.c', 'utility.c', 'is_key_down.c', 'microphone.c', 'utility.c',
'filter.c', 'extdemod.c', 'freedv.c'] + extra_sources 'filter.c', 'extdemod.c', 'freedv.c'] + extra_sources