prepped for 2.1 release

mrkite · May 28, 2016 · 2ba2464 · 2ba2464
1 parent 00339d6
commit 2ba2464
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/chunkcache.cpp b/chunkcache.cpp
@@ -19,7 +19,7 @@ uint qHash(const ChunkID &c) {
 }
 
 ChunkCache::ChunkCache() {
- size_t chunks = 10000; // 10% more than 1920x1200 blocks
+ int chunks = 10000; // 10% more than 1920x1200 blocks
 #if defined(__unix__) || defined(__unix) || defined(unix)
  auto pages = sysconf(_SC_AVPHYS_PAGES);
  auto page_size = sysconf(_SC_PAGE_SIZE);
@@ -29,7 +29,7 @@ ChunkCache::ChunkCache() {
  MEMORYSTATUSEX status;
  status.dwLength = sizeof(status);
  GlobalMemoryStatusEx(&status);
- DWORDLONG available = qmin(status.ullAvailPhys, status.ullAvailVirtual);
+ DWORDLONG available = qMin(status.ullAvailPhys, status.ullAvailVirtual);
  chunks = available / (sizeof(Chunk) + 16 * sizeof(ChunkSection));
 #endif
  cache.setMaxCost(chunks);

diff --git a/minutor.wxs b/minutor.wxs
@@ -31,7 +31,7 @@
 
  <DirectoryRef Id="INSTALLDIR">
  <Component Id="minutor.exe" Guid="670f74ff-eb96-4003-828a-2f24e5a42539">
- <File Id="minutor.exe" Source="Release\Minutor.exe" KeyPath="yes" Checksum="yes">
+ <File Id="minutor.exe" Source="minutor.exe" KeyPath="yes" Checksum="yes">
  <Shortcut Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Advertise="yes" Name="Minutor"
  WorkingDirectory="INSTALLDIR" Icon="icon.exe">
  <Icon Id="icon.exe" SourceFile="icon.ico" />