Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
10 changes: 5 additions & 5 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/settings_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading