SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Merge pull request #544 from sagasm/master

Browse Source 
修复几个win10上的编译问题。
This commit is contained in:
dreamsourcelabTAI
2022-10-27 17:47:17 +08:00
committed by GitHub
parent 5b238cc802 39de6d9385
commit 3b614ea7e2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -181,11 +181,12 @@ find_package(Qt5Core QUIET)
if(Qt5Core_FOUND)
message("----- Qt5:")
message(STATUS " includes:" ${Qt5Core_INCLUDE_DIRS})
find_package(Qt5WinExtras REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::WinExtras)
add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
find_package(Qt6Core QUIET)
@@ -543,7 +544,7 @@ if(WIN32)
set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
enable_language(RC)
# app icon
list(APPEND DSView_SOURCES DSView/applogo.rc)
list(APPEND DSView_SOURCES applogo.rc)
endif()
if(Qt5Core_FOUND)
@@ -588,7 +589,7 @@ endif()
#= Release flags
#-------------------------------------------------------------------------------
set(CMAKE_CXX_FLAGS "-Wall -Wextra")
set(CMAKE_BUILD_TYPE Release)
#set(CMAKE_BUILD_TYPE Release)
set(CMAKE_CXX_FLAGS_DEBUG "-g")
set(CMAKE_CXX_FLAGS_RELEASE "-O3")
add_compile_options(-O3)

4
DSView/pv/utility/path.cpp
View File

@@ -47,7 +47,7 @@ namespace path{
std::string str;
#ifdef _WIN32
QTextCodec *codec = QTextCodec::codecForName("System");
QTextCodec *codec = QTextCodec::codecForLocale();
QByteArray str_tmp = codec->fromUnicode(path);
str = str_tmp.data();
#else
@@ -57,4 +57,4 @@ namespace path{
return str;
}
}
}
}