Mercurial > hg > tony
changeset 458:60779173dddf
Win32 build updates; version is 1.0
| author | Chris Cannam |
|---|---|
| date | Wed, 01 Apr 2015 12:59:34 +0100 |
| parents | a2d7e5f75bac |
| children | 259ea354202b |
| files | .hgsubstate deploy/win32/build.cmd deploy/win32/tony.wxs src/main.cpp version.h |
| diffstat | 5 files changed, 21 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Mar 31 18:16:09 2015 +0100 +++ b/.hgsubstate Wed Apr 01 12:59:34 2015 +0100 @@ -1,6 +1,6 @@ f9f5185ab1a9dbd5115ee8fb5c55397e3d753854 chp d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay -1629209f5bf21fc926bb6abd5ab786e78c5d7677 pyin +0ea1d1b67396e6fea7988ed4523ba8835461564d pyin 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds da520a68595a983bd206c01463549858e3389286 svapp 24c48323c662a3631ba004f4701a328cbf753893 svcore
--- a/deploy/win32/build.cmd Tue Mar 31 18:16:09 2015 +0100 +++ b/deploy/win32/build.cmd Wed Apr 01 12:59:34 2015 +0100 @@ -1,7 +1,7 @@ @ECHO OFF -SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.8\bin" +SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.9\bin" IF NOT EXIST %WIXPATH% ( - SET WIXPATH="C:\Program Files\WiX Toolset v3.8\bin" + SET WIXPATH="C:\Program Files\WiX Toolset v3.9\bin" ) IF NOT EXIST %WIXPATH% ( ECHO "WiX not found, exiting"
--- a/deploy/win32/tony.wxs Tue Mar 31 18:16:09 2015 +0100 +++ b/deploy/win32/tony.wxs Wed Apr 01 12:59:34 2015 +0100 @@ -5,7 +5,7 @@ Id="*" Language="1033" Codepage="1252" - Version="0.5" + Version="1.0" UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1" Manufacturer="Queen Mary, University of London"> @@ -13,7 +13,7 @@ Id="*" Keywords="Installer" Description="Tony Installer" - Comments="Copyright (c) 2013 Queen Mary, University of London and others." + Comments="Copyright (c) 2015 Queen Mary, University of London and others." Manufacturer="Queen Mary, University of London" InstallerVersion="100" Languages="1033" @@ -142,20 +142,20 @@ DiskId="1" Source="release\Qt5Xml.dll"/> <File - Id="icudt52" - Name="icudt52.dll" + Id="icudt53" + Name="icudt53.dll" DiskId="1" - Source="release\icudt52.dll"/> + Source="release\icudt53.dll"/> <File - Id="icuin52" - Name="icuin52.dll" + Id="icuin53" + Name="icuin53.dll" DiskId="1" - Source="release\icuin52.dll"/> + Source="release\icuin53.dll"/> <File - Id="icuuc52" - Name="icuuc52.dll" + Id="icuuc53" + Name="icuuc53.dll" DiskId="1" - Source="release\icuuc52.dll"/> + Source="release\icuuc53.dll"/> <File Id="libgcc" Name="libgcc_s_dw2-1.dll"
--- a/src/main.cpp Tue Mar 31 18:16:09 2015 +0100 +++ b/src/main.cpp Wed Apr 01 12:59:34 2015 +0100 @@ -39,6 +39,7 @@ #include <iostream> #include <signal.h> +#include <cstdlib> #include <vamp-hostsdk/PluginHostAdapter.h> @@ -153,8 +154,11 @@ QString newPath = tonyVampPath + sep + vampPath; cerr << "Setting VAMP_PATH to " << newPath << " for Tony plugins" << endl; - - setenv("VAMP_PATH", newPath.toLocal8Bit().data(), 1); + + QString env = "VAMP_PATH=" + newPath; + + // Windows lacks setenv, must use putenv (different arg convention) + putenv(strdup(env.toLocal8Bit().data())); } int