changeset 548:702a70e48ca9

Windows build works

--- a/.appveyor.yml	Fri Feb 15 10:57:38 2019 +0000
+++ b/.appveyor.yml	Fri Feb 15 18:14:04 2019 +0000
@@ -12,13 +12,7 @@
   - ps: '"[hostsecurity]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
   - ps: '"code.soundsoftware.ac.uk = code.soundsoftware.ac.uk:fingerprints=sha256:64:75:f6:47:15:de:b4:51:ea:96:e2:f4:8a:f5:53:a5:11:c8:dd:82:73:5d:bd:54:18:cb:c8:9d:10:37:28:85" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
 
-before_build:
-  - set QTDIR=C:\Qt\5.10\msvc2017_64
-  - set PATH=%PATH%;%QTDIR%\bin;C:\Program Files (x86)\SMLNJ\bin
-  - repoint install
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-  - qmake -r -tp vc tony.pro
+build_script:
+  - deploy\win64\build-and-package.bat
 
-build:
-  project: tony.sln
   

--- a/.hgignore	Fri Feb 15 10:57:38 2019 +0000
+++ b/.hgignore	Fri Feb 15 18:14:04 2019 +0000
@@ -37,3 +37,10 @@
 chp
 pyin
 glob:.repoint*
+build_win32
+build_win64
+build_win64_debug
+*.AppImage
+*.AppDir
+Dockerfile*.gen
+squashfs-root

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chp.pro	Fri Feb 15 18:14:04 2019 +0000
@@ -0,0 +1,29 @@
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+INCLUDEPATH += vamp-plugin-sdk
+
+## !!! + vampGetPluginDescriptor export
+
+CONFIG -= qt
+CONFIG += plugin release warn_on
+
+TARGET = chp
+
+SOURCES += \
+    chp/ConstrainedHarmonicPeak.cpp \
+    chp/plugins.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
+
+HEADERS += \
+    chp/ConstrainedHarmonicPeak.h
+

--- a/noconfig.pri	Fri Feb 15 10:57:38 2019 +0000
+++ b/noconfig.pri	Fri Feb 15 18:14:04 2019 +0000
@@ -60,7 +60,7 @@
 
     # This config is currently used for 32-bit Windows builds.
 
-    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include
+    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include $$PWD/sv-dependency-builds/win32-mingw/include/opus
 
     LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pyin.pro	Fri Feb 15 18:14:04 2019 +0000
@@ -0,0 +1,48 @@
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+INCLUDEPATH += vamp-plugin-sdk ../boost_1_69_0
+
+## !!! + vampGetPluginDescriptor export
+
+CONFIG -= qt
+CONFIG += plugin release warn_on
+
+TARGET = pyin
+
+SOURCES += \
+    pyin/YinUtil.cpp \
+    pyin/Yin.cpp \
+    pyin/SparseHMM.cpp \
+    pyin/MonoPitchHMM.cpp \
+    pyin/MonoNoteParameters.cpp \
+    pyin/MonoNoteHMM.cpp \
+    pyin/MonoNote.cpp \
+    pyin/libmain.cpp \
+    pyin/YinVamp.cpp \
+    pyin/PYinVamp.cpp \
+    pyin/LocalCandidatePYIN.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
+
+HEADERS += \
+    pyin/YinUtil.h \
+    pyin/Yin.h \
+    pyin/SparseHMM.h \
+    pyin/MonoPitchHMM.h \
+    pyin/MonoNoteParameters.h \
+    pyin/MonoNoteHMM.h \
+    pyin/MonoNote.h \
+    pyin/MeanFilter.h \
+    pyin/YinVamp.h \
+    pyin/PYinVamp.h \
+    pyin/LocalCandidatePYIN.h
+

--- a/src/main.cpp	Fri Feb 15 10:57:38 2019 +0000
+++ b/src/main.cpp	Fri Feb 15 18:14:04 2019 +0000
@@ -128,7 +128,7 @@
     std::wstring wvar = variable.toStdWString();
     wchar_t *value = _wgetenv(wvar.c_str());
     if (!value) return QString();
-    else return QString::fromUtf16(value);
+    else return QString::fromStdWString(std::wstring(value));
 #else
     std::string var = variable.toStdString();
     return QString::fromUtf8(qgetenv(var.c_str()));
@@ -140,7 +140,7 @@
 {
 #ifdef Q_OS_WIN32
     std::wstring wassignment = assignment.toStdWString();
-    _wputenv(wstrdup(wassignment));
+    _wputenv(_wcsdup(wassignment.c_str()));
 #else
     putenv(strdup(assignment.toUtf8().data()));
 #endif
@@ -165,12 +165,12 @@
         if (programFiles == "") programFiles = "C:\\Program Files";
         QString defaultTonyPath(programFiles + "\\Tony");
         tonyVampPath = tonyVampPath + sep + defaultTonyPath;
-#endif
-        
+#else
 #ifndef Q_OS_MAC
         QString defaultTonyPath("/usr/local/lib/tony:/usr/lib/tony");
         tonyVampPath = tonyVampPath + sep + defaultTonyPath;
 #endif
+#endif
     }
 
     std::vector<std::string> vampPathList = 

--- a/tony.pro	Fri Feb 15 10:57:38 2019 +0000
+++ b/tony.pro	Fri Feb 15 18:14:04 2019 +0000
@@ -15,8 +15,10 @@
         sub_test_svcore_data_model
 
 SUBDIRS += \
-	sub_tony
-
+	sub_tony \
+        sub_pyin \
+        sub_chp
+        
 sub_base.file = base.pro
         
 sub_test_svcore_base.file = test-svcore-base.pro
@@ -25,5 +27,7 @@
 sub_test_svcore_data_model.file = test-svcore-data-model.pro
 
 sub_tony.file = tonyapp.pro
+sub_pyin.file = pyin.pro
+sub_chp.file = chp.pro
 
 CONFIG += ordered