kopia lustrzana https://github.com/f4exb/sdrangel
				
				
				
			Windows build: code re-organization in two libraries sdrbase and sdrgui
							rodzic
							
								
									fa77ca3fb6
								
							
						
					
					
						commit
						c86cea5cbb
					
				|  | @ -6,6 +6,7 @@ | |||
| 
 | ||||
| TEMPLATE = subdirs | ||||
| SUBDIRS = sdrbase | ||||
| SUBDIRS += sdrgui | ||||
| #SUBDIRS += librtlsdr | ||||
| #SUBDIRS += libhackrf | ||||
| #SUBDIRS += libairspy | ||||
|  |  | |||
|  | @ -6,6 +6,7 @@ | |||
| 
 | ||||
| TEMPLATE = subdirs | ||||
| SUBDIRS = sdrbase | ||||
| SUBDIRS += sdrgui | ||||
| SUBDIRS += devices | ||||
| SUBDIRS += fcdhid | ||||
| SUBDIRS += fcdlib | ||||
|  |  | |||
|  | @ -8,6 +8,7 @@ TEMPLATE = subdirs | |||
| 
 | ||||
| SUBDIRS = serialdv | ||||
| SUBDIRS += sdrbase | ||||
| SUBDIRS += sdrgui | ||||
| CONFIG(MINGW64)SUBDIRS += nanomsg | ||||
| SUBDIRS += fcdhid | ||||
| SUBDIRS += fcdlib | ||||
|  |  | |||
|  | @ -45,13 +45,10 @@ win32 { | |||
|         dsp/dvserialworker.cpp | ||||
| } | ||||
| 
 | ||||
| SOURCES += mainwindow.cpp\ | ||||
|         audio/audiodeviceinfo.cpp\ | ||||
| SOURCES += audio/audiodeviceinfo.cpp\ | ||||
|         audio/audiofifo.cpp\ | ||||
|         audio/audiooutput.cpp\ | ||||
|         audio/audioinput.cpp\ | ||||
|         device/devicesourceapi.cpp\ | ||||
|         device/devicesinkapi.cpp\ | ||||
|         dsp/afsquelch.cpp\ | ||||
|         dsp/agc.cpp\ | ||||
|         dsp/downchannelizer.cpp\ | ||||
|  | @ -84,50 +81,12 @@ SOURCES += mainwindow.cpp\ | |||
|         dsp/basebandsamplesink.cpp\ | ||||
|         dsp/basebandsamplesource.cpp\ | ||||
|         dsp/nullsink.cpp\ | ||||
|         dsp/spectrumscopecombovis.cpp\ | ||||
|         dsp/spectrumscopengcombovis.cpp\ | ||||
|         dsp/scopevis.cpp\ | ||||
|         dsp/scopevisng.cpp\ | ||||
|         dsp/spectrumvis.cpp\ | ||||
|         dsp/threadedbasebandsamplesink.cpp\ | ||||
|         dsp/threadedbasebandsamplesource.cpp\ | ||||
|         dsp/wfir.cpp\ | ||||
|         gui/aboutdialog.cpp\ | ||||
|         gui/addpresetdialog.cpp\ | ||||
|         gui/basicchannelsettingswidget.cpp\ | ||||
|         gui/basicchannelsettingsdialog.cpp\ | ||||
|         gui/buttonswitch.cpp\ | ||||
|         gui/channelwindow.cpp\ | ||||
|         gui/clickablelabel.cpp\ | ||||
|         gui/colormapper.cpp\ | ||||
|         gui/cwkeyergui.cpp\ | ||||
|         gui/glscope.cpp\ | ||||
|         gui/glscopegui.cpp\ | ||||
|         gui/glscopeng.cpp\ | ||||
|         gui/glscopenggui.cpp\ | ||||
|         gui/glshadersimple.cpp\ | ||||
|         gui/glshadertextured.cpp\ | ||||
|         gui/glspectrum.cpp\ | ||||
|         gui/glspectrumgui.cpp\ | ||||
|         gui/indicator.cpp\ | ||||
|         gui/levelmeter.cpp\ | ||||
|         gui/pluginsdialog.cpp\ | ||||
|         gui/audiodialog.cpp\ | ||||
|         gui/presetitem.cpp\ | ||||
|         gui/rollupwidget.cpp\ | ||||
|         gui/samplingdevicecontrol.cpp\ | ||||
|         gui/mypositiondialog.cpp\ | ||||
|         gui/scale.cpp\ | ||||
|         gui/scaleengine.cpp\ | ||||
|         gui/transverterbutton.cpp\ | ||||
|         gui/transverterdialog.cpp\ | ||||
|         gui/valuedial.cpp\ | ||||
|         gui/valuedialz.cpp\ | ||||
|         dsp/devicesamplesource.cpp\ | ||||
|         dsp/devicesamplesink.cpp\ | ||||
|         plugin/pluginapi.cpp\ | ||||
|         plugin/plugininterface.cpp\ | ||||
|         plugin/pluginmanager.cpp\ | ||||
|         settings/preferences.cpp\ | ||||
|         settings/preset.cpp\ | ||||
|         settings/mainsettings.cpp\ | ||||
|  | @ -140,8 +99,7 @@ SOURCES += mainwindow.cpp\ | |||
|         util/samplesourceserializer.cpp\ | ||||
|         util/simpleserializer.cpp | ||||
| 
 | ||||
| HEADERS  += mainwindow.h\ | ||||
|         audio/audiodeviceinfo.h\ | ||||
| HEADERS  += audio/audiodeviceinfo.h\ | ||||
|         audio/audiofifo.h\ | ||||
|         audio/audiooutput.h\ | ||||
|         audio/audioinput.h\ | ||||
|  | @ -194,52 +152,13 @@ HEADERS  += mainwindow.h\ | |||
|         dsp/basebandsamplesink.h\ | ||||
|         dsp/basebandsamplesource.h\ | ||||
|         dsp/nullsink.h\ | ||||
|         dsp/spectrumscopecombovis.h\ | ||||
|         dsp/spectrumscopengcombovis.h\         | ||||
|         dsp/scopevis.h\ | ||||
|         dsp/scopevisng.h\ | ||||
|         dsp/spectrumvis.h\ | ||||
|         dsp/threadedbasebandsamplesink.h\ | ||||
|         dsp/threadedbasebandsamplesource.h\ | ||||
|         dsp/wfir.h\ | ||||
|         gui/aboutdialog.h\ | ||||
|         gui/addpresetdialog.h\ | ||||
|         gui/audiodialog.h\ | ||||
|         gui/basicchannelsettingswidget.h\ | ||||
|         gui/basicchannelsettingsdialog.h\ | ||||
|         gui/buttonswitch.h\ | ||||
|         gui/channelwindow.h\ | ||||
|         gui/clickablelabel.h\ | ||||
|         gui/colormapper.h\ | ||||
|         gui/cwkeyergui.h\ | ||||
|         gui/glscope.h\ | ||||
|         gui/glscopegui.h\ | ||||
|         gui/glscopeng.h\ | ||||
|         gui/glscopenggui.h\ | ||||
|         gui/glshadersimple.h\ | ||||
|         gui/glshadertextured.h\ | ||||
|         gui/glspectrum.h\ | ||||
|         gui/glspectrumgui.h\ | ||||
|         gui/indicator.h\ | ||||
|         gui/levelmeter.h\ | ||||
|         gui/physicalunit.h\ | ||||
|         gui/pluginsdialog.h\ | ||||
|         gui/presetitem.h\ | ||||
|         gui/rollupwidget.h\ | ||||
|         gui/samplingdevicecontrol.h\ | ||||
|         gui/mypositiondialog.h\ | ||||
|         gui/scale.h\ | ||||
|         gui/scaleengine.h\ | ||||
|         gui/transverterbutton.h\ | ||||
|         gui/transverterdialog.h\ | ||||
|         gui/valuedial.h\ | ||||
|         gui/valuedialz.h\ | ||||
|         dsp/devicesamplesource.h\ | ||||
|         dsp/devicesamplesink.h\ | ||||
|         plugin/pluginapi.h\ | ||||
|         plugin/plugininstancegui.h\ | ||||
|         plugin/plugininterface.h\ | ||||
|         plugin/pluginmanager.h\ | ||||
|         settings/preferences.h\ | ||||
|         settings/preset.h\ | ||||
|         settings/mainsettings.h\ | ||||
|  | @ -253,25 +172,6 @@ HEADERS  += mainwindow.h\ | |||
|         util/samplesourceserializer.h\ | ||||
|         util/simpleserializer.h | ||||
| 
 | ||||
| FORMS    += mainwindow.ui\ | ||||
|         gui/scopewindow.ui\ | ||||
|         gui/addpresetdialog.ui\ | ||||
|         gui/basicchannelsettingswidget.ui\ | ||||
|         gui/basicchannelsettingsdialog.ui\ | ||||
|         gui/cwkeyergui.ui\ | ||||
|         gui/audiodialog.ui\ | ||||
|         gui/glscopegui.ui\ | ||||
|         gui/glscopenggui.ui\ | ||||
|         gui/aboutdialog.ui\ | ||||
|         gui/pluginsdialog.ui\ | ||||
|         gui/samplingdevicecontrol.ui\ | ||||
|         gui/myposdialog.ui\ | ||||
|         gui/glspectrumgui.ui\ | ||||
|         gui/transverterdialog.ui\ | ||||
|         mainwindow.ui | ||||
| 
 | ||||
| RESOURCES = resources/res.qrc | ||||
| 
 | ||||
| !macx:LIBS += -L../serialdv/$${build_subdir} -lserialdv | ||||
| 
 | ||||
| CONFIG(ANDROID):CONFIG += mobility | ||||
|  |  | |||
|  | @ -0,0 +1,143 @@ | |||
| #-------------------------------------------------------- | ||||
| # | ||||
| # Pro file for Android and Windows builds with Qt Creator | ||||
| # | ||||
| #-------------------------------------------------------- | ||||
| 
 | ||||
| QT += core gui multimedia opengl | ||||
| greaterThan(QT_MAJOR_VERSION, 4): QT += widgets | ||||
| 
 | ||||
| TEMPLATE = lib | ||||
| TARGET = sdrbase | ||||
| INCLUDEPATH += $$PWD | ||||
| 
 | ||||
| DEFINES += USE_KISSFFT=1 | ||||
| win32 { | ||||
|     DEFINES += __WINDOWS__=1 | ||||
|     DEFINES += DSD_USE_SERIALDV=1 | ||||
| } | ||||
| DEFINES += USE_SSE2=1 | ||||
| QMAKE_CXXFLAGS += -msse2 | ||||
| DEFINES += USE_SSE4_1=1 | ||||
| QMAKE_CXXFLAGS += -msse4.1 | ||||
| 
 | ||||
| QMAKE_CXXFLAGS += -std=c++11 | ||||
| 
 | ||||
| CONFIG(Release):build_subdir = release | ||||
| CONFIG(Debug):build_subdir = debug | ||||
| 
 | ||||
| CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 | ||||
| 
 | ||||
| CONFIG(MINGW32):INCLUDEPATH += "D:\boost_1_58_0" | ||||
| CONFIG(MINGW64):INCLUDEPATH += "D:\boost_1_58_0" | ||||
| 
 | ||||
| CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0" | ||||
| 
 | ||||
| SOURCES += mainwindow.cpp\ | ||||
|         device/devicesourceapi.cpp\ | ||||
|         device/devicesinkapi.cpp\ | ||||
|         dsp/spectrumscopecombovis.cpp\ | ||||
|         dsp/spectrumscopengcombovis.cpp\ | ||||
|         dsp/scopevis.cpp\ | ||||
|         dsp/scopevisng.cpp\ | ||||
|         dsp/spectrumvis.cpp\ | ||||
|         gui/aboutdialog.cpp\ | ||||
|         gui/addpresetdialog.cpp\ | ||||
|         gui/basicchannelsettingswidget.cpp\ | ||||
|         gui/basicchannelsettingsdialog.cpp\ | ||||
|         gui/buttonswitch.cpp\ | ||||
|         gui/channelwindow.cpp\ | ||||
|         gui/clickablelabel.cpp\ | ||||
|         gui/colormapper.cpp\ | ||||
|         gui/cwkeyergui.cpp\ | ||||
|         gui/glscope.cpp\ | ||||
|         gui/glscopegui.cpp\ | ||||
|         gui/glscopeng.cpp\ | ||||
|         gui/glscopenggui.cpp\ | ||||
|         gui/glshadersimple.cpp\ | ||||
|         gui/glshadertextured.cpp\ | ||||
|         gui/glspectrum.cpp\ | ||||
|         gui/glspectrumgui.cpp\ | ||||
|         gui/indicator.cpp\ | ||||
|         gui/levelmeter.cpp\ | ||||
|         gui/pluginsdialog.cpp\ | ||||
|         gui/audiodialog.cpp\ | ||||
|         gui/presetitem.cpp\ | ||||
|         gui/rollupwidget.cpp\ | ||||
|         gui/samplingdevicecontrol.cpp\ | ||||
|         gui/mypositiondialog.cpp\ | ||||
|         gui/scale.cpp\ | ||||
|         gui/scaleengine.cpp\ | ||||
|         gui/transverterbutton.cpp\ | ||||
|         gui/transverterdialog.cpp\ | ||||
|         gui/valuedial.cpp\ | ||||
|         gui/valuedialz.cpp\ | ||||
|         plugin/pluginapi.cpp\ | ||||
|         plugin/pluginmanager.cpp | ||||
| 
 | ||||
| HEADERS  += mainwindow.h\ | ||||
|         device/devicesourceapi.h\ | ||||
|         device/devicesinkapi.h\ | ||||
|         dsp/spectrumscopecombovis.h\ | ||||
|         dsp/spectrumscopengcombovis.h\         | ||||
|         dsp/scopevis.h\ | ||||
|         dsp/scopevisng.h\ | ||||
|         dsp/spectrumvis.h\ | ||||
|         gui/aboutdialog.h\ | ||||
|         gui/addpresetdialog.h\ | ||||
|         gui/audiodialog.h\ | ||||
|         gui/basicchannelsettingswidget.h\ | ||||
|         gui/basicchannelsettingsdialog.h\ | ||||
|         gui/buttonswitch.h\ | ||||
|         gui/channelwindow.h\ | ||||
|         gui/clickablelabel.h\ | ||||
|         gui/colormapper.h\ | ||||
|         gui/cwkeyergui.h\ | ||||
|         gui/glscope.h\ | ||||
|         gui/glscopegui.h\ | ||||
|         gui/glscopeng.h\ | ||||
|         gui/glscopenggui.h\ | ||||
|         gui/glshadersimple.h\ | ||||
|         gui/glshadertextured.h\ | ||||
|         gui/glspectrum.h\ | ||||
|         gui/glspectrumgui.h\ | ||||
|         gui/indicator.h\ | ||||
|         gui/levelmeter.h\ | ||||
|         gui/physicalunit.h\ | ||||
|         gui/pluginsdialog.h\ | ||||
|         gui/presetitem.h\ | ||||
|         gui/rollupwidget.h\ | ||||
|         gui/samplingdevicecontrol.h\ | ||||
|         gui/mypositiondialog.h\ | ||||
|         gui/scale.h\ | ||||
|         gui/scaleengine.h\ | ||||
|         gui/transverterbutton.h\ | ||||
|         gui/transverterdialog.h\ | ||||
|         gui/valuedial.h\ | ||||
|         gui/valuedialz.h\ | ||||
|         dsp/devicesamplesource.h\ | ||||
|         dsp/devicesamplesink.h\ | ||||
|         plugin/pluginapi.h\ | ||||
|         plugin/pluginmanager.h | ||||
|          | ||||
| FORMS    += mainwindow.ui\ | ||||
|         gui/scopewindow.ui\ | ||||
|         gui/addpresetdialog.ui\ | ||||
|         gui/basicchannelsettingswidget.ui\ | ||||
|         gui/basicchannelsettingsdialog.ui\ | ||||
|         gui/cwkeyergui.ui\ | ||||
|         gui/audiodialog.ui\ | ||||
|         gui/glscopegui.ui\ | ||||
|         gui/glscopenggui.ui\ | ||||
|         gui/aboutdialog.ui\ | ||||
|         gui/pluginsdialog.ui\ | ||||
|         gui/samplingdevicecontrol.ui\ | ||||
|         gui/myposdialog.ui\ | ||||
|         gui/glspectrumgui.ui\ | ||||
|         gui/transverterdialog.ui\ | ||||
|         mainwindow.ui | ||||
| 
 | ||||
| RESOURCES = resources/res.qrc | ||||
| 
 | ||||
| CONFIG(ANDROID):CONFIG += mobility | ||||
| CONFIG(ANDROID):MOBILITY = | ||||
		Ładowanie…
	
		Reference in New Issue
	
	 f4exb
						f4exb