Merge branch 'staging' of github.com:stream-labs/obs-studio-node into…

… crash-handler-integration
stream-labs · Oct 18, 2018 · 857d739 · 857d739
2 parents f8d8a6f + b2f2e82
commit 857d739
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,7 +16,7 @@ environment:
       RuntimeVersion: "2.0.8"
     - RuntimeURL: https://atom.io/download/atom-shell
       RuntimeName: iojs
-      RuntimeVersion: "3.0.0"
+      RuntimeVersion: "3.0.4"
   NodeVersion: 9
   SLBuildDirectory: streamlabs-build
   SLGenerator: Visual Studio 15 2017 Win64

diff --git a/obs-studio-client/CMakeLists.txt b/obs-studio-client/CMakeLists.txt
@@ -9,7 +9,7 @@ PROJECT(
 
 SET(NODEJS_URL "https://atom.io/download/atom-shell" CACHE STRING "Node.JS URL")
 SET(NODEJS_NAME "iojs" CACHE STRING "Node.JS Name")
-SET(NODEJS_VERSION "v2.0.4" CACHE STRING "Node.JS Version")
+SET(NODEJS_VERSION "v3.0.4" CACHE STRING "Node.JS Version")
 
 ################################################################################
 # Compiler