taynpg/frelay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: linux compile.

Browse Source
This commit is contained in:
taynpg
2025-07-04 21:44:52 +08:00
parent 5cb93675bd
commit c37df2f4bc
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.vscode/settings.json vendored
View File

@@ -17,19 +17,19 @@
"ignoreFailures": true "ignoreFailures": true
} }
], ],
"visualizerFile": "${workspaceRoot}/.vscode/qt6.natvis", "visualizerFile": "${workspaceRoot}/.vscode/qt5.natvis",
"args": ["127.0.0.1", "9009"] "args": ["127.0.0.1", "9009"]
}, },
"cmake.configureArgs": [ "cmake.configureArgs": [
"-Wno-dev" "-Wno-dev"
], ],
"cmake.environment": { "cmake.environment": {
"QT_LIB_ROOT": "D:/Dev/Qt6/msvc2022_64", "QT_LIB_ROOT": "/home/yun/Qt5.14.2/5.14.2/gcc_64",
"PATH": "${env:PATH};D:/Dev/Qt6/msvc2022_64/bin" "PATH": "${env:PATH};/home/yun/Qt5.14.2/5.14.2/gcc_64/bin"
}, },
"cmake.configureSettings": { "cmake.configureSettings": {
"CMAKE_PREFIX_PATH": "${env:QT_LIB_ROOT}", "CMAKE_PREFIX_PATH": "${env:QT_LIB_ROOT}",
"QT_DEFAULT_MAJOR_VERSION": "6", "QT_DEFAULT_MAJOR_VERSION": "5",
"COMPILE_GUI": "ON" "COMPILE_GUI": "ON"
}, },
"cmake.options.statusBarVisibility": "visible", "cmake.options.statusBarVisibility": "visible",

2
CMakeLists.txt
View File

@@ -29,7 +29,6 @@ endif()
if(WIN32) if(WIN32)
if(DEFINED XP_PLATFORM_SUPPORT) if(DEFINED XP_PLATFORM_SUPPORT)
message(STATUS "Support Windows XP platform => ${XP_PLATFORM_SUPPORT}.") message(STATUS "Support Windows XP platform => ${XP_PLATFORM_SUPPORT}.")
include_directories(${CMAKE_SOURCE_DIR}/Gui/Control)
add_definitions(-D_WIN32_WINNT=0x0501) add_definitions(-D_WIN32_WINNT=0x0501)
else() else()
add_definitions(-D_WIN32_WINNT=0x0601) add_definitions(-D_WIN32_WINNT=0x0601)
@@ -37,6 +36,7 @@ endif()
endif() endif()
set(CMAKE_DEBUG_POSTFIX "d") set(CMAKE_DEBUG_POSTFIX "d")
include_directories(${CMAKE_SOURCE_DIR}/Gui/Control)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}) set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}/)
include_directories(${PROJECT_BINARY_DIR}) include_directories(${PROJECT_BINARY_DIR})

4
Gui/main.cpp
View File

@@ -23,12 +23,12 @@ int main(int argc, char* argv[])
CRASHELPER_MARK_ENTRY(); CRASHELPER_MARK_ENTRY();
#endif #endif
SingleApplication a(argc, argv);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif #endif
SingleApplication a(argc, argv);
#ifdef _WIN32 #ifdef _WIN32
QFont font("Microsoft YaHei", 9); QFont font("Microsoft YaHei", 9);
a.setFont(font); a.setFont(font);

2
crashelper/include/crashelper.h
View File

@@ -48,7 +48,7 @@ void UseExceptionHandler(EXCEPTION_POINTERS* exception);
#elif defined(LINUX_OS) #elif defined(LINUX_OS)
#define CRASHELPER_MARK_ENTRY() \ #define CRASHELPER_MARK_ENTRY() \
backward::SignalHandling sh; \ backward::SignalHandling sh; \
sh.register_crash_path([]() -> QString { return backward::GetCurFullLogPath(); }) sh.register_crash_path([]() -> std::string { return backward::GetCurFullLogPath(); })
#endif #endif
#endif // CRASHELPER_H #endif // CRASHELPER_H

4
crashelper/src/crashelper.cxx
View File

@@ -15,8 +15,8 @@ std::function<std::string()> backward::SignalHandling::crash_path_getter_ = null
std::function<void(EXCEPTION_POINTERS* info)> backward::SignalHandling::crash_use_handler_ = nullptr; std::function<void(EXCEPTION_POINTERS* info)> backward::SignalHandling::crash_use_handler_ = nullptr;
std::function<void(int sig)> backward::SignalHandling::user_sig_handler_ = nullptr; std::function<void(int sig)> backward::SignalHandling::user_sig_handler_ = nullptr;
#else #else
std::function<std::string()> crash_path_getter_ = nullptr; std::function<std::string()> backward::SignalHandling::crash_path_getter_ = nullptr;
std::function<void(int sig)> user_sig_handler_ = nullptr; std::function<void(int sig)> backward::SignalHandling::user_sig_handler_ = nullptr;
#endif #endif
namespace backward { namespace backward {