mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-25 12:07:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OSX build

Browse Source
This commit is contained in:
Howard Su
2020-10-22 08:28:43 +08:00
parent fbd7321b48
commit 4bf88739b5
5 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/CMakeLists.txt
View File

@ -60,7 +60,9 @@ if (MSVC)
find_package(portaudio CONFIG REQUIRED)
target_link_libraries(sdrpp_core PUBLIC portaudio portaudio_static)
else()
endif (MSVC)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_include_directories(sdrpp_core PUBLIC "/usr/include/volk")
target_link_libraries(sdrpp_core PUBLIC pthread)
@ -73,7 +75,39 @@ else()
target_link_libraries(sdrpp_core PUBLIC X11)
target_link_libraries(sdrpp_core PUBLIC Xxf86vm)
target_link_libraries(sdrpp_core PUBLIC dl)
endif (MSVC)
endif ()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
find_package(OpenGL REQUIRED)
# find_package(GLEW REQUIRED)
# find_package(fftw3 REQUIRED)
# find_package(glfw3 REQUIRED)
# find_package(volk REQUIRED)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/glew/include)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/glfw/include)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/fftw/include)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/portaudio/include)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/volk/include)
target_include_directories(sdrpp_core PUBLIC /usr/local/opt/volk/include/volk)
target_link_directories(sdrpp_core PUBLIC /usr/local/opt/glew/lib)
target_link_directories(sdrpp_core PUBLIC /usr/local/opt/volk/lib)
target_link_directories(sdrpp_core PUBLIC /usr/local/opt/glfw/lib)
target_link_directories(sdrpp_core PUBLIC /usr/local/opt/fftw/lib)
target_link_directories(sdrpp_core PUBLIC /usr/local/opt/portaudio/lib)
target_link_libraries(sdrpp_core PUBLIC ${OPENGL_LIBRARIES})
target_link_libraries(sdrpp_core PUBLIC volk)
target_link_libraries(sdrpp_core PUBLIC glew)
target_link_libraries(sdrpp_core PUBLIC glfw)
target_link_libraries(sdrpp_core PUBLIC fftw3)
target_link_libraries(sdrpp_core PUBLIC fftw3f)
target_link_libraries(sdrpp_core PUBLIC portaudio)
endif ()
target_link_libraries(sdrpp_core PUBLIC volk)

3
core/src/gui/waterfall.cpp
View File

@ -104,8 +104,6 @@ namespace ImGui {
viewBandwidth = 1.0;
wholeBandwidth = 1.0;
glGenTextures(1, &textureId);
updatePallette(COLOR_MAP, 13);
}
@ -363,6 +361,7 @@ namespace ImGui {
}
void WaterFall::updateWaterfallTexture() {
glGenTextures(1, &textureId);
glBindTexture(GL_TEXTURE_2D, textureId);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);