reapack

commit 12e5e25303a3c618eb1f6f6ca0567241360add21
parent 734b210f8b0c70d5df040826dff43d7d426b0b61
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Fri, 26 Feb 2016 12:59:16 -0800

update to Visual Studio 2015 for windows builds

Diffstat:
M
README.md
 | 
25
++++++++++++++-----------
M
src/manager.cpp
 | 
2
+-
M
src/registry.cpp
 | 
6
+++---
M
src/transaction.hpp
 | 
2
+-
M
win32.tup
 | 
7
+++----

5 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
@@ -45,13 +45,16 @@ vendor
   [tup](http://gittup.org/tup/win32/tup-explicit-variant-v0.7.3-45-gcf6a829.zip)
   (explicit-variant branch, see [this
   thread](https://groups.google.com/d/topic/tup-users/UNUSE15PQdA/discussion))
-  and [Visual Studio Express 2013 for
-  Desktop](https://www.microsoft.com/en-us/download/details.aspx?id=48131)
-2. Download the latest [boost](http://www.boost.org/) and copy the
+  and [Visual Studio 2015, with Visual C++](https://www.visualstudio.com/products/visual-studio-community-vs)
+2. Prevent Microsoft's C++ compiler from saving telemetry outside of the build directory:
+   [instructions here](https://msdn.microsoft.com/en-us/library/ee225238.aspx#Anchor_5)
+   or set the `OptIn` registry key to `0` in
+   `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VSCommon\14.0\SQM`
+3. Download the latest [boost](http://www.boost.org/) and copy the
   `boost` subdirectory into `<reapack>\vendor`
-3. Download the latest [curl](http://curl.haxx.se/download.html) source
+4. Download the latest [curl](http://curl.haxx.se/download.html) source
   code and extract it on your computer
-4. Launch "Developer Command Prompt for VS2013" and run the following commands:
+5. Launch "Developer Command Prompt for VS2015" and run the following commands:
   ```sh
   cd Path\To\Curl\winbuild
   
@@ -61,13 +64,13 @@ vendor
   "%VCINSTALLDIR%\vcvarsall" x86
   nmake /f Makefile.vc mode=static RTLIBCFG=static ENABLE_IDN=no MACHINE=x86
   ```
-5. Copy `<curl directory>\builds\libcurl-vc-x64-release-static-ipv6-sspi-winssl`
+6. Copy `<curl directory>\builds\libcurl-vc-x64-release-static-ipv6-sspi-winssl`
   to `<reapack directory>\vendor` as `libcurl64`
-6. Copy `<curl directory>\builds\libcurl-vc-x86-release-static-ipv6-sspi-winssl`
+7. Copy `<curl directory>\builds\libcurl-vc-x86-release-static-ipv6-sspi-winssl`
   to `<reapack directory>\vendor` as `libcurl32`
-7. Download the latest stable amalgamation build of [sqlite](https://www.sqlite.org/download.html).
+8. Download the latest stable amalgamation build of [sqlite](https://www.sqlite.org/download.html).
    Put `sqlite3.h` and `sqlite3.c` in `<reapack>\vendor`.
-8. Run `rake` from this directory using
-  "Developer Command Prompt for VS2013"
-9. Copy or symlink `x64\bin\reaper_reapack64.dll` or `x86\bin\reaper_reapack32.dll`
+9. Run `rake` from this directory using
+  "Developer Command Prompt for VS2015"
+10. Copy or symlink `x64\bin\reaper_reapack64.dll` or `x86\bin\reaper_reapack32.dll`
    to your REAPER plugin folder
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -224,7 +224,7 @@ bool Manager::confirm() const
 
   auto_char msg[255] = {};
   auto_snprintf(msg, sizeof(msg),
-    AUTO_STR("Uninstall %lu remote%s?\n")
+    AUTO_STR("Uninstall %zu remote%s?\n")
     AUTO_STR("Every file they contain will be removed from your computer."),
     uninstallSize, uninstallSize == 1 ? AUTO_STR("") : AUTO_STR("s"));
 
diff --git a/src/registry.cpp b/src/registry.cpp
@@ -298,7 +298,7 @@ void Registry::forget(const Entry &entry)
 void Registry::savepoint()
 {
   char sql[64] = {};
-  sprintf(sql, "SAVEPOINT sp%lu", m_savePoint++);
+  sprintf(sql, "SAVEPOINT sp%zu", m_savePoint++);
 
   m_db.exec(sql);
 }
@@ -306,7 +306,7 @@ void Registry::savepoint()
 void Registry::restore()
 {
   char sql[64] = {};
-  sprintf(sql, "ROLLBACK TO SAVEPOINT sp%lu", --m_savePoint);
+  sprintf(sql, "ROLLBACK TO SAVEPOINT sp%zu", --m_savePoint);
 
   m_db.exec(sql);
 }
@@ -314,7 +314,7 @@ void Registry::restore()
 void Registry::release()
 {
   char sql[64] = {};
-  sprintf(sql, "RELEASE SAVEPOINT sp%lu", --m_savePoint);
+  sprintf(sql, "RELEASE SAVEPOINT sp%zu", --m_savePoint);
 
   m_db.exec(sql);
 }
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -48,7 +48,7 @@ public:
     std::string title;
   };
 
-  typedef std::vector<const Error> ErrorList;
+  typedef std::vector<Error> ErrorList;
 
   Transaction();
   ~Transaction();
diff --git a/win32.tup b/win32.tup
@@ -13,7 +13,7 @@ CXXFLAGS += /DWDL_NO_DEFINE_MINMAX
 CXXFLAGS += /DCURL_STATICLIB /DUNICODE /DNDEBUG
 CXXFLAGS += /DREAPACK_FILE#\"$(REAPACK_FILE).dll\"
 
-SQLFLAGS := /Os /wd4101 /DSQLITE_OMIT_FLOATING_POINT
+SQLFLAGS := /Os /wd4101
 SQLFLAGS += /DSQLITE_OMIT_COMPOUND_SELECT /DSQLITE_OMIT_DATETIME_FUNCS
 SQLFLAGS += /DSQLITE_OMIT_INTEGRITY_CHECK /DSQLITE_OMIT_UTF16
 SQLFLAGS += /DSQLITE_OMIT_SHARED_CACHE /DSQLITE_OMIT_INCRBLOB
@@ -21,9 +21,8 @@ SQLFLAGS += /DSQLITE_OMIT_AUTHORIZATION /DSQLITE_OMIT_PAGER_PRAGMAS
 SQLFLAGS += /DSQLITE_OMIT_BUILTIN_TEST /DSQLITE_OMIT_SCHEMA_PRAGMAS
 SQLFLAGS += /DSQLITE_OMIT_TRACE /DSQLITE_OMIT_LOAD_EXTENSION
 SQLFLAGS += /DSQLITE_OMIT_GET_TABLE /DSQLITE_OMIT_COMPLETE /DSQLITE_OMIT_TEMPDB
-SQLFLAGS += /DSQLITE_OMIT_COMPILEOPTION_DIAGS /DSQLITE_OMIT_CAS
-SQLFLAGS += /DSQLITE_OMIT_CHECK /DSQLITE_OMIT_BLOB_LITERAL
-SQLFLAGS += /DSQLITE_OMIT_DECLTYPE /DSQLITE_OMIT_DEPRECATED
+SQLFLAGS += /DSQLITE_OMIT_COMPILEOPTION_DIAGS /DSQLITE_OMIT_CAST
+SQLFLAGS += /DSQLITE_OMIT_CHECK /DSQLITE_OMIT_DECLTYPE /DSQLITE_OMIT_DEPRECATED
 
 LD := $(WRAP) link
 LDFLAGS := /nologo user32.lib shell32.lib