mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-04-03 18:18:31 -04:00
Merged include-gpl into include and removed GPL dribble in About dialog
This commit is contained in:
f4exb
parent
c46741bd72
commit
e9127d1b92
100
CMakeLists.txt
100
CMakeLists.txt
@ -121,72 +121,72 @@ set(sdrbase_SOURCES
|
||||
)
|
||||
|
||||
set(sdrbase_HEADERS
|
||||
include-gpl/mainwindow.h
|
||||
include/mainwindow.h
|
||||
|
||||
include-gpl/audio/audiodeviceinfo.h
|
||||
include-gpl/audio/audiofifo.h
|
||||
include-gpl/audio/audiooutput.h
|
||||
include/audio/audiodeviceinfo.h
|
||||
include/audio/audiofifo.h
|
||||
include/audio/audiooutput.h
|
||||
|
||||
include-gpl/dsp/afsquelch.h
|
||||
include-gpl/dsp/channelizer.h
|
||||
include/dsp/afsquelch.h
|
||||
include/dsp/channelizer.h
|
||||
include/dsp/channelmarker.h
|
||||
include-gpl/dsp/complex.h
|
||||
include-gpl/dsp/decimators.h
|
||||
include-gpl/dsp/dspcommands.h
|
||||
include-gpl/dsp/dspengine.h
|
||||
include/dsp/complex.h
|
||||
include/dsp/decimators.h
|
||||
include/dsp/dspcommands.h
|
||||
include/dsp/dspengine.h
|
||||
include/dsp/dsptypes.h
|
||||
include-gpl/dsp/fftengine.h
|
||||
include-gpl/dsp/fftfilt.h
|
||||
include-gpl/dsp/fftwengine.h
|
||||
include-gpl/dsp/fftwindow.h
|
||||
include-gpl/dsp/filesink.h
|
||||
include-gpl/dsp/gfft.h
|
||||
include-gpl/dsp/interpolator.h
|
||||
include-gpl/dsp/inthalfbandfilter.h
|
||||
include/dsp/fftengine.h
|
||||
include/dsp/fftfilt.h
|
||||
include/dsp/fftwengine.h
|
||||
include/dsp/fftwindow.h
|
||||
include/dsp/filesink.h
|
||||
include/dsp/gfft.h
|
||||
include/dsp/interpolator.h
|
||||
include/dsp/inthalfbandfilter.h
|
||||
include/dsp/kissfft.h
|
||||
include-gpl/dsp/kissengine.h
|
||||
include-gpl/dsp/lowpass.h
|
||||
include-gpl/dsp/misc.h
|
||||
include-gpl/dsp/movingaverage.h
|
||||
include-gpl/dsp/nco.h
|
||||
include/dsp/kissengine.h
|
||||
include/dsp/lowpass.h
|
||||
include/dsp/misc.h
|
||||
include/dsp/movingaverage.h
|
||||
include/dsp/nco.h
|
||||
sdrbase/dsp/pidcontroller.h
|
||||
include/dsp/samplefifo.h
|
||||
include/dsp/samplesink.h
|
||||
include-gpl/dsp/nullsink.h
|
||||
include-gpl/dsp/scopevis.h
|
||||
include-gpl/dsp/spectrumvis.h
|
||||
include/dsp/nullsink.h
|
||||
include/dsp/scopevis.h
|
||||
include/dsp/spectrumvis.h
|
||||
include/dsp/threadedsamplesink.h
|
||||
|
||||
include-gpl/gui/aboutdialog.h
|
||||
include-gpl/gui/addpresetdialog.h
|
||||
include/gui/aboutdialog.h
|
||||
include/gui/addpresetdialog.h
|
||||
include/gui/basicchannelsettingswidget.h
|
||||
include-gpl/gui/buttonswitch.h
|
||||
include-gpl/gui/channelwindow.h
|
||||
include-gpl/gui/colormapper.h
|
||||
include-gpl/gui/glscope.h
|
||||
include-gpl/gui/glscopegui.h
|
||||
include-gpl/gui/glspectrum.h
|
||||
include-gpl/gui/glspectrumgui.h
|
||||
include-gpl/gui/indicator.h
|
||||
include-gpl/gui/physicalunit.h
|
||||
include-gpl/gui/pluginsdialog.h
|
||||
include-gpl/gui/preferencesdialog.h
|
||||
include-gpl/gui/presetitem.h
|
||||
include/gui/buttonswitch.h
|
||||
include/gui/channelwindow.h
|
||||
include/gui/colormapper.h
|
||||
include/gui/glscope.h
|
||||
include/gui/glscopegui.h
|
||||
include/gui/glspectrum.h
|
||||
include/gui/glspectrumgui.h
|
||||
include/gui/indicator.h
|
||||
include/gui/physicalunit.h
|
||||
include/gui/pluginsdialog.h
|
||||
include/gui/preferencesdialog.h
|
||||
include/gui/presetitem.h
|
||||
include/gui/rollupwidget.h
|
||||
include-gpl/gui/scale.h
|
||||
include-gpl/gui/scaleengine.h
|
||||
include-gpl/gui/valuedial.h
|
||||
include/gui/scale.h
|
||||
include/gui/scaleengine.h
|
||||
include/gui/valuedial.h
|
||||
|
||||
include/dsp/samplesource.h
|
||||
|
||||
include/plugin/pluginapi.h
|
||||
include/plugin/plugingui.h
|
||||
include/plugin/plugininterface.h
|
||||
include-gpl/plugin/pluginmanager.h
|
||||
include/plugin/pluginmanager.h
|
||||
|
||||
include-gpl/settings/preferences.h
|
||||
include-gpl/settings/preset.h
|
||||
include-gpl/settings/mainsettings.h
|
||||
include/settings/preferences.h
|
||||
include/settings/preset.h
|
||||
include/settings/mainsettings.h
|
||||
|
||||
include/util/export.h
|
||||
include/util/message.h
|
||||
@ -227,7 +227,7 @@ if(FFTW3F_FOUND)
|
||||
)
|
||||
set(sdrbase_HEADERS
|
||||
${sdrbase_HEADERS}
|
||||
include-gpl/dsp/fftwengine.h
|
||||
include/dsp/fftwengine.h
|
||||
)
|
||||
add_definitions(-DUSE_FFTW)
|
||||
include_directories(${FFTW3F_INCLUDE_DIRS})
|
||||
@ -239,7 +239,7 @@ else(FFTW3F_FOUND)
|
||||
)
|
||||
set(sdrbase_HEADERS
|
||||
${sdrbase_HEADERS}
|
||||
include-gpl/dsp/kissengine.h
|
||||
include/dsp/kissengine.h
|
||||
)
|
||||
add_definitions(-DUSE_KISSFFT)
|
||||
endif(FFTW3F_FOUND)
|
||||
@ -279,7 +279,7 @@ qt5_use_modules(sdrbase Core Widgets OpenGL Multimedia)
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/include-gpl
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${OPENGL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
|
||||
@ -181,6 +181,8 @@ Assuming Debian Jessie is used:
|
||||
- Corrected decimators bit shifting so that the number of effective output bits is constant and fill the internal sample width
|
||||
- Separate library to support all flavours of FunCube dongles. Rewritten FCD plugins.
|
||||
- Allow several sample source plugins to share the same presets for what is common
|
||||
- Prepare grounds for future Tx operations with Tx spectrum display in the main window
|
||||
- Merged include-gpl into include and removed GPL dribble in About dialog
|
||||
- Many other little things...
|
||||
|
||||
<h1>To Do</h1>
|
||||
|
||||
@ -78,18 +78,7 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string><p>Copyright (C) 2015 Edouard Griffiths, F4EXB. </p>
|
||||
<p>Code at <a href="https://github.com/f4exb/sdrangel">https://github.com/f4exb/sdrangel</a> This is a complete redesign from RTL-SDRangelove at <a href="https://github.com/hexameron/rtl-sdrangelove">https://github.com/hexameron/rtl-sdrangelove</a></p>
|
||||
<p>Many thanks to the original developers:</p>
|
||||
<p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p>
|
||||
<p>Christian Daniel from maintech GmbH.<p>
|
||||
<p>John Greb (hexameron) for the contributions in RTL-SDRangelove<p>
|
||||
<p>SDRangel itself is licensed as "GPL2+" with the added exception, that plugins using only header files from the "include"-subdirectory and not from the "include-gpl"-subdirectory do not count as derived works.</p>
|
||||
<p>The following rules apply to the SDRangel main application and libsdrbase:<br>
|
||||
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
|
||||
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
|
||||
<p>For the license of installed plugins, look into the plugin list.</p></string>
|
||||
<string><html><head/><body><p>Copyright (C) 2015 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a> This is a complete redesign from RTL-SDRangelove at <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/hexameron/rtl-sdrangelove</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in RTL-SDRangelove</p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user