Merge remote-tracking branch 'origin/RB-2.2'

MrKepzie · Jan 11, 2017 · 9621da1 · 9621da1
2 parents a86aedf + 34b949b
commit 9621da1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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();
 

diff --git a/libs.pri b/libs.pri
@@ -74,15 +74,15 @@ CONFIG += static-libmv static-openmvg static-hoedown static-libtess static-seria
 
 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