diff --git a/CMakeLists.txt b/CMakeLists.txt
index e84095f..3e0840d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,13 @@ execute_process(
)
+# Update version numbers based on the latest git tag to the repository
+if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/package-info.json.in")
+ include(${CMAKE_CURRENT_SOURCE_DIR}/source/max-sdk-core/script/git-rev.cmake)
+ message("Building _____ ${GIT_TAG} _____")
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/package-info.json.in" "${CMAKE_CURRENT_LIST_DIR}/package-info.json" @ONLY)
+endif ()
+
# Macro from http://stackoverflow.com/questions/7787823/cmake-how-to-get-the-name-of-all-subdirectories-of-a-directory
MACRO(SUBDIRLIST result curdir)
FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
@@ -28,6 +35,8 @@ ENDMACRO()
# Now build every project using the macro above
SUBDIRLIST(PROJECT_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/source/projects)
foreach(project_dir ${PROJECT_DIRS})
- MESSAGE("Generating: ${project_dir}")
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir})
+ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir}/CMakeLists.txt")
+ message("Generating: ${project_dir}")
+ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/${project_dir})
+ endif()
endforeach()
diff --git a/appveyor.yml b/appveyor.yml
index 3647a93..9437e4c 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,3 @@
-version: '1.1.beta-{build}'
-
environment:
CMAKE_PATH: $(APPVEYOR_BUILD_FOLDER)\cmake-3.4.1-win32-x86
VS_VERSION: "Visual Studio 12"
diff --git a/externals/nw.cppan~.mxe b/externals/nw.cppan~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.cppan~.mxe64 b/externals/nw.cppan~.mxe64
old mode 100644
new mode 100755
index 455ec1f..78b8bc3
Binary files a/externals/nw.cppan~.mxe64 and b/externals/nw.cppan~.mxe64 differ
diff --git a/externals/nw.cppan~.mxo/Contents/Info.plist b/externals/nw.cppan~.mxo/Contents/Info.plist
index 83188bb..b9e76c3 100644
--- a/externals/nw.cppan~.mxo/Contents/Info.plist
+++ b/externals/nw.cppan~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.gateplus~.mxe b/externals/nw.gateplus~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.gateplus~.mxe64 b/externals/nw.gateplus~.mxe64
old mode 100644
new mode 100755
index 62fd68e..e27c2ba
Binary files a/externals/nw.gateplus~.mxe64 and b/externals/nw.gateplus~.mxe64 differ
diff --git a/externals/nw.gateplus~.mxo/Contents/Info.plist b/externals/nw.gateplus~.mxo/Contents/Info.plist
index c7f8ede..428d6aa 100644
--- a/externals/nw.gateplus~.mxo/Contents/Info.plist
+++ b/externals/nw.gateplus~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.grainbang~.mxe b/externals/nw.grainbang~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.grainbang~.mxe64 b/externals/nw.grainbang~.mxe64
old mode 100644
new mode 100755
index d377065..1086e0b
Binary files a/externals/nw.grainbang~.mxe64 and b/externals/nw.grainbang~.mxe64 differ
diff --git a/externals/nw.grainbang~.mxo/Contents/Info.plist b/externals/nw.grainbang~.mxo/Contents/Info.plist
index 268fbf6..36dc603 100644
--- a/externals/nw.grainbang~.mxo/Contents/Info.plist
+++ b/externals/nw.grainbang~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.grainphase~.mxe b/externals/nw.grainphase~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.grainphase~.mxe64 b/externals/nw.grainphase~.mxe64
old mode 100644
new mode 100755
index e89b795..38c6361
Binary files a/externals/nw.grainphase~.mxe64 and b/externals/nw.grainphase~.mxe64 differ
diff --git a/externals/nw.grainphase~.mxo/Contents/Info.plist b/externals/nw.grainphase~.mxo/Contents/Info.plist
index 59a2a65..bc99055 100644
--- a/externals/nw.grainphase~.mxo/Contents/Info.plist
+++ b/externals/nw.grainphase~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.grainpulse~.mxe b/externals/nw.grainpulse~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.grainpulse~.mxe64 b/externals/nw.grainpulse~.mxe64
old mode 100644
new mode 100755
index 9e4b235..4121da6
Binary files a/externals/nw.grainpulse~.mxe64 and b/externals/nw.grainpulse~.mxe64 differ
diff --git a/externals/nw.grainpulse~.mxo/Contents/Info.plist b/externals/nw.grainpulse~.mxo/Contents/Info.plist
index 2895762..af248cf 100644
--- a/externals/nw.grainpulse~.mxo/Contents/Info.plist
+++ b/externals/nw.grainpulse~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.grainstream~.mxe b/externals/nw.grainstream~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.grainstream~.mxe64 b/externals/nw.grainstream~.mxe64
old mode 100644
new mode 100755
index 43fb39d..3af75c6
Binary files a/externals/nw.grainstream~.mxe64 and b/externals/nw.grainstream~.mxe64 differ
diff --git a/externals/nw.grainstream~.mxo/Contents/Info.plist b/externals/nw.grainstream~.mxo/Contents/Info.plist
index c827ecb..2be7a00 100644
--- a/externals/nw.grainstream~.mxo/Contents/Info.plist
+++ b/externals/nw.grainstream~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.gverb~.mxe b/externals/nw.gverb~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.gverb~.mxe64 b/externals/nw.gverb~.mxe64
old mode 100644
new mode 100755
index 4208985..477ca7a
Binary files a/externals/nw.gverb~.mxe64 and b/externals/nw.gverb~.mxe64 differ
diff --git a/externals/nw.gverb~.mxo/Contents/Info.plist b/externals/nw.gverb~.mxo/Contents/Info.plist
index bc6fd5d..647d5ad 100644
--- a/externals/nw.gverb~.mxo/Contents/Info.plist
+++ b/externals/nw.gverb~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.phasorshift~.mxe b/externals/nw.phasorshift~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.phasorshift~.mxe64 b/externals/nw.phasorshift~.mxe64
old mode 100644
new mode 100755
index db53719..3684e0d
Binary files a/externals/nw.phasorshift~.mxe64 and b/externals/nw.phasorshift~.mxe64 differ
diff --git a/externals/nw.phasorshift~.mxo/Contents/Info.plist b/externals/nw.phasorshift~.mxo/Contents/Info.plist
index 18742f7..351494a 100644
--- a/externals/nw.phasorshift~.mxo/Contents/Info.plist
+++ b/externals/nw.phasorshift~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.pulsesamp~.mxe b/externals/nw.pulsesamp~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.pulsesamp~.mxe64 b/externals/nw.pulsesamp~.mxe64
old mode 100644
new mode 100755
index 2ff69e0..893bb78
Binary files a/externals/nw.pulsesamp~.mxe64 and b/externals/nw.pulsesamp~.mxe64 differ
diff --git a/externals/nw.pulsesamp~.mxo/Contents/Info.plist b/externals/nw.pulsesamp~.mxo/Contents/Info.plist
index fd72fa3..9c95655 100644
--- a/externals/nw.pulsesamp~.mxo/Contents/Info.plist
+++ b/externals/nw.pulsesamp~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.recordplus~.mxe b/externals/nw.recordplus~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.recordplus~.mxe64 b/externals/nw.recordplus~.mxe64
old mode 100644
new mode 100755
index 9ead794..7ce8d44
Binary files a/externals/nw.recordplus~.mxe64 and b/externals/nw.recordplus~.mxe64 differ
diff --git a/externals/nw.recordplus~.mxo/Contents/Info.plist b/externals/nw.recordplus~.mxo/Contents/Info.plist
index a1f475a..7593b50 100644
--- a/externals/nw.recordplus~.mxo/Contents/Info.plist
+++ b/externals/nw.recordplus~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/externals/nw.trainshift~.mxe b/externals/nw.trainshift~.mxe
old mode 100644
new mode 100755
diff --git a/externals/nw.trainshift~.mxe64 b/externals/nw.trainshift~.mxe64
old mode 100644
new mode 100755
index 1510024..2258591
Binary files a/externals/nw.trainshift~.mxe64 and b/externals/nw.trainshift~.mxe64 differ
diff --git a/externals/nw.trainshift~.mxo/Contents/Info.plist b/externals/nw.trainshift~.mxo/Contents/Info.plist
index ff45d28..3f40fb3 100644
--- a/externals/nw.trainshift~.mxo/Contents/Info.plist
+++ b/externals/nw.trainshift~.mxo/Contents/Info.plist
@@ -25,7 +25,7 @@
CFBundleSignature
????
CFBundleVersion
-
+ 1.1.beta2
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/package-info.json b/package-info.json
index 5874d8e..26fc533 100644
--- a/package-info.json
+++ b/package-info.json
@@ -22,12 +22,12 @@
}
,
"tags" : [ "granular", "sampling", "reverb", "zero-crossings" ],
- "version" : "1.1.beta",
+ "version" : "1.1.beta2",
"website" : "http://www.nathanwolek.com",
"filelist" : {
"externals" : [ "nw.cppan~.mxo", "nw.gateplus~.mxo", "nw.grainbang~.mxo", "nw.grainphase~.mxo", "nw.grainpulse~.mxo", "nw.grainstream~.mxo", "nw.gverb~.mxo", "nw.phasorshift~.mxo", "nw.pulsesamp~.mxo", "nw.recordplus~.mxo", "nw.trainshift~.mxo" ],
"patchers" : [ "buffer-scrub-demo.maxpat", "gate-comparison.maxpat", "module_demo/g_2voice/g_2voice.model.maxhelp", "module_demo/g_2voice/g_2voice.model.maxpat", "module_demo/g_2voice/g_2voice.model.presets.txt", "module_demo/g_2voice/g_2voice.module.maxpat", "module_demo/g_2voice/g_2voice.view.maxpat", "module_demo/readme.md", "record-comparison.maxpat", "reverb-mix-demo.maxpat", "time-stretch-demo.maxpat" ],
- "help" : [ "nw.cppan~.maxhelp", "nw.cycle.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
+ "help" : [ "nw.cppan~.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
"media" : [ "grain_windows/3stage-linear_30.aiff", "grain_windows/3stage-linear_50.aiff", "grain_windows/blackman-harris.aiff", "grain_windows/blackman.aiff", "grain_windows/expodec.aiff", "grain_windows/gauss.aiff", "grain_windows/hamming.aiff", "grain_windows/hanning.aiff", "grain_windows/quasi-gauss_30.aiff", "grain_windows/quasi-gauss_50.aiff", "grain_windows/rexpodec.aiff", "grain_windows/triangle.aiff" ],
"docs" : [ "nw.cppan~.maxref.xml", "nw.gateplus~.maxref.xml", "nw.grainbang~.maxref.xml", "nw.grainphase~.maxref.xml", "nw.grainpulse~.maxref.xml", "nw.grainstream~.maxref.xml", "nw.gverb~.maxref.xml", "nw.phasorshift~.maxref.xml", "nw.pulsesamp~.maxref.xml", "nw.recordplus~.maxref.xml", "nw.trainshift~.maxref.xml" ],
"javascript" : [ "nw.cycle.js" ],
diff --git a/package-info.json.in b/package-info.json.in
new file mode 100644
index 0000000..f078033
--- /dev/null
+++ b/package-info.json.in
@@ -0,0 +1,37 @@
+{
+ "author" : "Nathan Wolek",
+ "authors" : [ ],
+ "description" : "Contains updated objects from the Granular Toolkit, a classic stereo reverb and some twists on standard MSP objects that makes them savvy about zero-crossings. ",
+ "displayname" : "",
+ "extends" : "",
+ "extensible" : 0,
+ "homepatcher" : "LowkeyNW-Overview.maxpat",
+ "max_version_max" : "7.2",
+ "max_version_min" : "6.1",
+ "name" : "LowkeyNW",
+ "os" : {
+ "macintosh" : {
+ "platform" : [ "x64" ],
+ "min_version" : "10.7.x"
+ }
+,
+ "windows" : {
+
+ }
+
+ }
+,
+ "tags" : [ "granular", "sampling", "reverb", "zero-crossings" ],
+ "version" : "@GIT_VERSION_MAJ@.@GIT_VERSION_MIN@.@GIT_VERSION_SUB@",
+ "website" : "http://www.nathanwolek.com",
+ "filelist" : {
+ "externals" : [ "nw.cppan~.mxo", "nw.gateplus~.mxo", "nw.grainbang~.mxo", "nw.grainphase~.mxo", "nw.grainpulse~.mxo", "nw.grainstream~.mxo", "nw.gverb~.mxo", "nw.phasorshift~.mxo", "nw.pulsesamp~.mxo", "nw.recordplus~.mxo", "nw.trainshift~.mxo" ],
+ "patchers" : [ "buffer-scrub-demo.maxpat", "gate-comparison.maxpat", "module_demo/g_2voice/g_2voice.model.maxhelp", "module_demo/g_2voice/g_2voice.model.maxpat", "module_demo/g_2voice/g_2voice.model.presets.txt", "module_demo/g_2voice/g_2voice.module.maxpat", "module_demo/g_2voice/g_2voice.view.maxpat", "module_demo/readme.md", "record-comparison.maxpat", "reverb-mix-demo.maxpat", "time-stretch-demo.maxpat" ],
+ "help" : [ "nw.cppan~.maxhelp", "nw.gateplus~.maxhelp", "nw.grainbang~.maxhelp", "nw.grainphase~.maxhelp", "nw.grainpulse~.maxhelp", "nw.grainstream~.maxhelp", "nw.gverb~.maxhelp", "nw.phasorshift~.maxhelp", "nw.pulsesamp~.maxhelp", "nw.recordplus~.maxhelp", "nw.trainshift~.maxhelp" ],
+ "media" : [ "grain_windows/3stage-linear_30.aiff", "grain_windows/3stage-linear_50.aiff", "grain_windows/blackman-harris.aiff", "grain_windows/blackman.aiff", "grain_windows/expodec.aiff", "grain_windows/gauss.aiff", "grain_windows/hamming.aiff", "grain_windows/hanning.aiff", "grain_windows/quasi-gauss_30.aiff", "grain_windows/quasi-gauss_50.aiff", "grain_windows/rexpodec.aiff", "grain_windows/triangle.aiff" ],
+ "docs" : [ "nw.cppan~.maxref.xml", "nw.gateplus~.maxref.xml", "nw.grainbang~.maxref.xml", "nw.grainphase~.maxref.xml", "nw.grainpulse~.maxref.xml", "nw.grainstream~.maxref.xml", "nw.gverb~.maxref.xml", "nw.phasorshift~.maxref.xml", "nw.pulsesamp~.maxref.xml", "nw.recordplus~.maxref.xml", "nw.trainshift~.maxref.xml" ],
+ "javascript" : [ "nw.cycle.js" ],
+ "extras" : [ "LowkeyNW-Overview.maxpat" ]
+ }
+
+}
diff --git a/source/max-sdk-core b/source/max-sdk-core
index e34ccd5..0ee9928 160000
--- a/source/max-sdk-core
+++ b/source/max-sdk-core
@@ -1 +1 @@
-Subproject commit e34ccd543ed7bc49f4b5b8695761079fba7aeead
+Subproject commit 0ee99281f59f1fd1213765102cf1bddaf7764de2