mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-26 20:37:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

easier build

Browse Source
This commit is contained in:
Ryzerth
2020-09-06 16:31:50 +02:00
parent e497122c06
commit c1052b1b28
27 changed files with 634 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frequency_select.cpp
View File

@ -9,7 +9,7 @@ FrequencySelect::FrequencySelect() {
}
void FrequencySelect::init() {
font = ImGui::GetIO().Fonts->AddFontFromFileTTF("res/fonts/Roboto-Medium.ttf", 42.0f);
font = ImGui::GetIO().Fonts->AddFontFromFileTTF((config::getRootDirectory() + "/res/fonts/Roboto-Medium.ttf").c_str(), 42.0f);
for (int i = 0; i < 12; i++) {
digits[i] = 0;
}

1
src/frequency_select.h
View File

@ -2,6 +2,7 @@
#include <imgui.h>
#include <imgui_internal.h>
#include <stdint.h>
#include <config.h>
class FrequencySelect {
public:

7
src/main.cpp
View File

@ -21,6 +21,9 @@
#include <Windows.h>
#endif
// Comment to build a normal release
// #define DEV_BUILD
bool maximized = false;
bool fullScreen = false;
@ -44,7 +47,9 @@ int main() {
spdlog::info("SDR++ v" VERSION_STR);
#ifdef _WIN32
#ifdef DEV_BUILD
config::setRootDirectory("../root");
#elif _WIN32
config::setRootDirectory(".");
#else
config::setRootDirectory("/etc/sdrpp");

1
src/main_window.cpp
View File

@ -841,6 +841,7 @@ void drawWindow() {
ImGui::BulletText("Benjamin Kyd");
ImGui::BulletText("Tobias Mädel");
ImGui::BulletText("Raov");
ImGui::BulletText("Howard0su");
// Libraries
ImGui::NextColumn();

4
src/style.cpp
View File

@ -9,7 +9,7 @@ namespace style {
ImGui::GetStyle().PopupRounding = 0.0f;
ImGui::GetStyle().ScrollbarRounding = 0.0f;
ImGui::GetIO().Fonts->AddFontFromFileTTF("res/fonts/Roboto-Medium.ttf", 16.0f);
ImGui::GetIO().Fonts->AddFontFromFileTTF((config::getRootDirectory() + "/res/fonts/Roboto-Medium.ttf").c_str(), 16.0f);
ImGui::StyleColorsDark();
//ImGui::StyleColorsLight();
@ -23,7 +23,7 @@ namespace style {
ImGui::GetStyle().PopupRounding = 0.0f;
ImGui::GetStyle().ScrollbarRounding = 0.0f;
ImGui::GetIO().Fonts->AddFontFromFileTTF("res/fonts/Roboto-Medium.ttf", 16.0f);
ImGui::GetIO().Fonts->AddFontFromFileTTF((config::getRootDirectory() + "/res/fonts/Roboto-Medium.ttf").c_str(), 16.0f);
ImGui::StyleColorsDark();

1
src/style.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <imgui.h>
#include <imgui_internal.h>
#include <config.h>
namespace style {
void setDefaultStyle();