lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-04-18 03:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

waver : fix font loading and snap build

Browse Source
This commit is contained in:
Georgi Gerganov
2021-02-27 22:36:36 +02:00
parent 770e464722
commit 74f35ebcf0
8 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -98,17 +98,3 @@ endif()
if (GGWAVE_BUILD_EXAMPLES) if (GGWAVE_BUILD_EXAMPLES)
add_subdirectory(examples) add_subdirectory(examples)
endif() endif()
install(TARGETS ggwave RUNTIME)
install(TARGETS ggwave-common RUNTIME)
install(TARGETS ggsock RUNTIME)
if (GGWAVE_SUPPORT_SDL2)
install(TARGETS ggwave-common-sdl2 RUNTIME)
install(TARGETS imgui RUNTIME)
install(TARGETS imgui-sdl2 RUNTIME)
install(TARGETS waver RUNTIME)
install(FILES ${PROJECT_SOURCE_DIR}/examples/assets/fonts/DroidSans.ttf DESTINATION bin)
install(FILES ${PROJECT_SOURCE_DIR}/examples/assets/fonts/fontawesome-webfont.ttf DESTINATION bin)
endif()

6
examples/CMakeLists.txt
View File

@@ -99,3 +99,9 @@ if (GGWAVE_SUPPORT_SDL2)
add_subdirectory(waver) add_subdirectory(waver)
add_subdirectory(spectrogram) add_subdirectory(spectrogram)
endif() endif()
install(TARGETS ggwave-common LIBRARY DESTINATION lib)
if (GGWAVE_SUPPORT_SDL2)
install(TARGETS ggwave-common-sdl2 LIBRARY DESTINATION lib)
endif()

2
examples/third-party/ggsock vendored

Submodule examples/third-party/ggsock updated: cb2f795301...e1a2377de4

6
examples/third-party/imgui/CMakeLists.txt vendored
View File

@@ -123,3 +123,9 @@ if (GGWAVE_SUPPORT_SDL2)
) )
endif() endif()
endif() endif()
install(TARGETS imgui LIBRARY DESTINATION lib)
if (GGWAVE_SUPPORT_SDL2)
install(TARGETS imgui-sdl2 LIBRARY DESTINATION lib)
endif()

5
examples/waver/CMakeLists.txt
View File

@@ -43,4 +43,9 @@ else()
imgui-sdl2 imgui-sdl2
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
install(FILES ${PROJECT_SOURCE_DIR}/examples/assets/fonts/DroidSans.ttf DESTINATION bin)
install(FILES ${PROJECT_SOURCE_DIR}/examples/assets/fonts/fontawesome-webfont.ttf DESTINATION bin)
endif() endif()
install(TARGETS ${TARGET} RUNTIME DESTINATION bin)

22
examples/waver/main.cpp
View File

@@ -229,15 +229,21 @@ int main(int argc, char** argv) {
ImGui_Init(window, gl_context); ImGui_Init(window, gl_context);
ImGui::GetIO().IniFilename = nullptr; ImGui::GetIO().IniFilename = nullptr;
ImGui_tryLoadFont(getBinaryPath() + "DroidSans.ttf", kGlobalImGuiScale*14.0f, false); {
ImGui_tryLoadFont(getBinaryPath() + "../bin/DroidSans.ttf", kGlobalImGuiScale*14.0f, false); bool isNotLoaded = true;
ImGui_tryLoadFont(getBinaryPath() + "../examples/assets/fonts/DroidSans.ttf", kGlobalImGuiScale*14.0f, false); isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "DroidSans.ttf", kGlobalImGuiScale*14.0f, false);
ImGui_tryLoadFont(getBinaryPath() + "../../examples/assets/fonts/DroidSans.ttf", kGlobalImGuiScale*14.0f, false); isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../bin/DroidSans.ttf", kGlobalImGuiScale*14.0f, false);
isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../examples/assets/fonts/DroidSans.ttf", kGlobalImGuiScale*14.0f, false);
isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../../examples/assets/fonts/DroidSans.ttf", kGlobalImGuiScale*14.0f, false);
}
ImGui_tryLoadFont(getBinaryPath() + "fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true); {
ImGui_tryLoadFont(getBinaryPath() + "../bin/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true); bool isNotLoaded = true;
ImGui_tryLoadFont(getBinaryPath() + "../examples/assets/fonts/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true); isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true);
ImGui_tryLoadFont(getBinaryPath() + "../../examples/assets/fonts/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true); isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../bin/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true);
isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../examples/assets/fonts/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true);
isNotLoaded = isNotLoaded && !ImGui_tryLoadFont(getBinaryPath() + "../../examples/assets/fonts/fontawesome-webfont.ttf", kGlobalImGuiScale*14.0f, true);
}
ImGui_SetStyle(); ImGui_SetStyle();

2
snap/snapcraft.yaml
View File

@@ -46,7 +46,7 @@
source: https://github.com/ggerganov/ggwave source: https://github.com/ggerganov/ggwave
source-type: git source-type: git
plugin: cmake plugin: cmake
configflags: [-DBUILD_SHARED_LIBS=OFF] #configflags: [-DBUILD_SHARED_LIBS=OFF]
build-packages: build-packages:
- g++ - g++
- make - make

2
src/CMakeLists.txt
View File

@@ -27,3 +27,5 @@ if (MINGW)
stdc++ stdc++
) )
endif() endif()
install(TARGETS ${TARGET} LIBRARY DESTINATION lib)