SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@143 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2015-06-24 15:03:16 +00:00
parent 433b668bf5
commit 4492ff605c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -140,7 +140,7 @@ if (${APPLE})
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
endif (${APPLE}) endif (${APPLE})
if (${WIN32}) if (${WIN32})
list(APPEND LIBS ws2_32 Iphlpapi Psapi) list(APPEND LIBS ws2_32 iphlpapi psapi)
#execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET) #execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
#list(APPEND CPPS "pip_resource_win.o") #list(APPEND CPPS "pip_resource_win.o")
list(APPEND CPPS "pip_resource_win.rc") list(APPEND CPPS "pip_resource_win.rc")

4
src/io/piserial.cpp
View File

@@ -715,8 +715,8 @@ PIStringList PISerial::availableDevices(bool test) {
PIVector<PIFile::FileInfo> de = dir.entries(); PIVector<PIFile::FileInfo> de = dir.entries();
piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo
piForeachC (PIString & p, prefixes) { piForeachC (PIString & p, prefixes) {
if (e.path.left(p.size_s()) != p) continue; if (e.name().left(p.size_s()) != p) continue;
dl << "/dev/" + e.path; dl << e.path;
} }
} }
# endif # endif

2
src/system/pisystemmonitor.cpp
View File

@@ -20,7 +20,7 @@
#include "pisystemmonitor.h" #include "pisystemmonitor.h"
#include "pisysteminfo.h" #include "pisysteminfo.h"
#ifdef WINDOWS #ifdef WINDOWS
# include "TlHelp32.h" # include "tlhelp32.h"
#endif #endif