mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-01 21:54:55 -04:00
Code re-organization in two libraries sdrbase and sdrgui in view of core / GUI split
This commit is contained in:
@@ -57,6 +57,7 @@ target_link_libraries(inputhackrf
|
||||
${QT_LIBRARIES}
|
||||
hackrf
|
||||
sdrbase
|
||||
sdrgui
|
||||
hackrfdevice
|
||||
)
|
||||
else (BUILD_DEBIAN)
|
||||
@@ -64,6 +65,7 @@ target_link_libraries(inputhackrf
|
||||
${QT_LIBRARIES}
|
||||
${LIBHACKRF_LIBRARIES}
|
||||
sdrbase
|
||||
sdrgui
|
||||
hackrfdevice
|
||||
)
|
||||
endif (BUILD_DEBIAN)
|
||||
|
||||
@@ -21,6 +21,7 @@ CONFIG(MINGW32):LIBHACKRFSRC = "D:\softs\hackrf\host"
|
||||
CONFIG(MINGW64):LIBHACKRFSRC = "D:\softs\hackrf\host"
|
||||
INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH += ../../../sdrbase
|
||||
INCLUDEPATH += ../../../sdrgui
|
||||
INCLUDEPATH += ../../../devices
|
||||
!macx:INCLUDEPATH += $$LIBHACKRFSRC
|
||||
macx:INCLUDEPATH += /opt/local/include
|
||||
@@ -43,8 +44,9 @@ HEADERS += hackrfinputgui.h\
|
||||
FORMS += hackrfinputgui.ui
|
||||
|
||||
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
|
||||
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
|
||||
!macx:LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
|
||||
macx:LIBS += -L/opt/local/lib -lhackrf
|
||||
LIBS += -L../../../devices/$${build_subdir} -ldevices
|
||||
|
||||
RESOURCES = ../../../sdrbase/resources/res.qrc
|
||||
RESOURCES = ../../../sdrgui/resources/res.qrc
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../sdrbase/resources/res.qrc">
|
||||
<iconset resource="../../../sdrgui/resources/res.qrc">
|
||||
<normaloff>:/play.png</normaloff>
|
||||
<normalon>:/stop.png</normalon>:/play.png</iconset>
|
||||
</property>
|
||||
@@ -83,7 +83,7 @@
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../sdrbase/resources/res.qrc">
|
||||
<iconset resource="../../../sdrgui/resources/res.qrc">
|
||||
<normaloff>:/record_off.png</normaloff>:/record_off.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
@@ -301,7 +301,7 @@
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../sdrbase/resources/res.qrc">
|
||||
<iconset resource="../../../sdrgui/resources/res.qrc">
|
||||
<normaloff>:/link.png</normaloff>:/link.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
@@ -684,7 +684,7 @@
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../../../sdrbase/resources/res.qrc"/>
|
||||
<include location="../../../sdrgui/resources/res.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Reference in New Issue
Block a user