From 26eac4fae4308674dde3e6a55de1106a523f252e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Wed, 11 Jan 2017 13:50:17 +0100 Subject: [PATCH 1/2] build: add -lpsapi on win32 for GetProcessMemoryInfo@12 --- libs.pri | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs.pri b/libs.pri index 6e7a806d34..216b51072f 100644 --- a/libs.pri +++ b/libs.pri @@ -201,15 +201,15 @@ CONFIG += static-libmv static-openmvg static-hoedown static-libtess win32-msvc*{ CONFIG(64bit) { - CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/x64/release/ -lEngine - CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/x64/debug/ -lEngine + CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/x64/release/ -lEngine -lpsapi + CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/x64/debug/ -lEngine -lpsapi } else { - CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/win32/release/ -lEngine - CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/win32/debug/ -lEngine + CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/win32/release/ -lEngine -lpsapi + CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/win32/debug/ -lEngine -lpsapi } } else { - win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/release/ -lEngine - else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/debug/ -lEngine + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/release/ -lEngine -lpsapi + else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/debug/ -lEngine -lpsapi else:*-xcode:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../Engine/build/Release/ -lEngine else:*-xcode:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../Engine/build/Debug/ -lEngine else:unix: LIBS += -L$$OUT_PWD/../Engine/ -lEngine From 34b949b1a145d04345d2acfee32dbe9b6b6aacba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Wed, 11 Jan 2017 13:55:09 +0100 Subject: [PATCH 2/2] MemoryInfo: disable unused functions --- Engine/MemoryInfo.cpp | 6 ++++++ Engine/MemoryInfo.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Engine/MemoryInfo.cpp b/Engine/MemoryInfo.cpp index 44977ed8fe..6855b82d7e 100644 --- a/Engine/MemoryInfo.cpp +++ b/Engine/MemoryInfo.cpp @@ -151,6 +151,8 @@ printAsRAM(U64 bytes) return QCoreApplication::translate("MemoryInfo", "%1 byte(s)").arg( QLocale().toString( (uint)bytes ) ); } + +#if 0 // not used for now /** * Returns the peak (maximum so far) resident set size (physical * memory use) measured in bytes, or zero if the value cannot be @@ -200,7 +202,9 @@ getPeakRSS( ) return (size_t)0L; /* Unsupported. */ #endif } +#endif // 0 +#if 0 // not used for now /** * Returns the current resident set size (physical memory use) measured * in bytes, or zero if the value cannot be determined on this OS. @@ -257,6 +261,8 @@ getCurrentRSS( ) return (size_t)0L; /* Unsupported. */ #endif } // getCurrentRSS +#endif // 0 + std::size_t getAmountFreePhysicalRAM() diff --git a/Engine/MemoryInfo.h b/Engine/MemoryInfo.h index 9804354370..cc340a97e4 100644 --- a/Engine/MemoryInfo.h +++ b/Engine/MemoryInfo.h @@ -49,6 +49,7 @@ U64 getSystemTotalRAM_conditionnally(); // prints RAM value as KB, MB or GB QString printAsRAM(U64 bytes); +#if 0 // not used for now /** * Returns the peak (maximum so far) resident set size (physical * memory use) measured in bytes, or zero if the value cannot be @@ -61,6 +62,7 @@ std::size_t getPeakRSS( ); * in bytes, or zero if the value cannot be determined on this OS. */ std::size_t getCurrentRSS( ); +#endif // 0 std::size_t getAmountFreePhysicalRAM();