diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml index 1ef608b..c099c04 100644 --- a/.github/workflows/multi-platform.yml +++ b/.github/workflows/multi-platform.yml @@ -55,9 +55,10 @@ jobs: # Make find_package(OpenSSL) pick up the Homebrew installation echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV" + # OpenSSL is shitting up in Chocolatey Package manager. We need to install an earlier version. - name: Install OpenSSL (Windows) if: matrix.os == 'windows-latest' - run: choco install openssl --no-progress -y + run: echo "Hi" # Test to see if OpenSSL is already isntalled. It is giving workflow issues... - name: Install GCC (macOS) if: matrix.os == 'macos-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 57c7a00..a95bbed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ set(windows_api "") if(WIN32 AND MSVC) # Limit assets embeding to msvc compilers only # such as clang-cl and MSVC (there exists no compiler of msvc flags # in the market except these two. Clang-cl is peak tho) - target_sources(${PROJECT_NAME} PRIVATE assets/resource.rc) + target_sources(${PROJECT_NAME} PRIVATE other/assets/resource.rc) set(windows_api "kernel32.lib") endif() diff --git a/src/main.cpp b/src/main.cpp index d49d672..86346c1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,11 +22,11 @@ int main() { try{ - application app; - app.run(); - endscreen endsc; - endsc.render(); - return 0; + application app; + app.run(); + endscreen endsc; + endsc.render(); + return 0; } catch(const std::runtime_error& e) { std::cerr << "Runtime error: " << e.what() << std::endl; return 1; diff --git a/src/settings_manager.cpp b/src/settings_manager.cpp index 4ec0449..3c80eb6 100644 --- a/src/settings_manager.cpp +++ b/src/settings_manager.cpp @@ -74,7 +74,7 @@ std::string settings_manager::get_config_dir() const { } return "./tpedia_config"; #else - // linux + // linux or freeBSD const char* xdg = std::getenv("XDG_CONFIG_HOME"); if (xdg) { return std::string(xdg) + "/tpedia";