From 87d25549c16a78f3f8feee445cc655f4ec74ac9f Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Thu, 13 Jul 2017 12:24:23 -0400
Subject: [PATCH] Fix line ending for Jenkinsfile Update Ghoul repository

---
 Jenkinsfile | 160 ++++++++++++++++++++++++++--------------------------
 ext/ghoul   |   2 +-
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8454bd82fc..1985a6a989 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,80 +1,80 @@
-def modules = [
-    "base",
-    "debugging",
-    "fieldlines",
-    "galaxy",
-    "globebrowsing",
-    "iswa",
-    "kameleon",
-    "kameleonvolume",
-    "multiresvolume",
-    "newhorizons",
-    "onscreengui",
-    "space",
-    "toyvolume",
-    "volume"
-];
-
-def flags = "-DGHOUL_USE_DEVIL=OFF "
-
-for (module in modules) {
-    flags += "-DOPENSPACE_OPENSPACE_MODULE_" + module.toUpperCase() + "=ON "
-}
-
-echo flags
-
-stage('Build') {
-    parallel linux: {
-        node('linux') {
-            timeout(time: 30, unit: 'MINUTES') {
-                checkout scm
-                sh 'git submodule update --init --recursive'
-                sh '''
-                    mkdir -p build
-                    cd build
-                    cmake .. ''' +
-                    flags + ''' ..
-                make
-                '''
-            }
-        }
-    },
-    windows: {
-        node('windows') {
-            timeout(time: 30, unit: 'MINUTES') {
-                checkout scm
-                bat '''
-                    git submodule update --init --recursive
-                    if not exist "build" mkdir "build"
-                    cd build
-                    cmake -G "Visual Studio 15 2017 Win64" .. ''' +
-                    flags + ''' ..
-                    msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /m:2 /p:Configuration=Debug
-                '''
-            }
-        }
-    },
-    osx: {
-        node('osx') {
-            timeout(time: 30, unit: 'MINUTES') {
-                checkout scm
-                sh 'git submodule update --init --recursive'
-                sh '''
-                    export PATH=${PATH}:/usr/local/bin:/Applications/CMake.app/Contents/bin
-                    export CMAKE_BUILD_TOOL=/Applications/CMake.app/Contents/bin/CMake
-                    srcDir=$PWD
-                    if [ ! -d ${srcDir} ]; then
-                      mkdir ${srcDir}
-                    fi
-                    if [ ! -d ${srcDir}/build ]; then
-                      mkdir ${srcDir}/build
-                    fi
-                    cd ${srcDir}/build
-                    /Applications/CMake.app/Contents/bin/cmake -G Xcode -D NASM=/usr/local/bin/nasm ${srcDir} .. ''' +
-                    flags + '''
-                    xcodebuild -quiet
-                    '''
-            }
-        }
-    }
-}
+def modules = [
+    "base",
+    "debugging",
+    "fieldlines",
+    "galaxy",
+    "globebrowsing",
+    "iswa",
+    "kameleon",
+    "kameleonvolume",
+    "multiresvolume",
+    "newhorizons",
+    "onscreengui",
+    "space",
+    "toyvolume",
+    "volume"
+];
+
+def flags = "-DGHOUL_USE_DEVIL=OFF "
+
+for (module in modules) {
+    flags += "-DOPENSPACE_OPENSPACE_MODULE_" + module.toUpperCase() + "=ON "
+}
+
+echo flags
+
+stage('Build') {
+    parallel linux: {
+        node('linux') {
+            timeout(time: 30, unit: 'MINUTES') {
+                checkout scm
+                sh 'git submodule update --init --recursive'
+                sh '''
+                    mkdir -p build
+                    cd build
+                    cmake .. ''' +
+                    flags + ''' ..
+                make
+                '''
+            }
+        }
+    },
+    windows: {
+        node('windows') {
+            timeout(time: 30, unit: 'MINUTES') {
+                checkout scm
+                bat '''
+                    git submodule update --init --recursive
+                    if not exist "build" mkdir "build"
+                    cd build
+                    cmake -G "Visual Studio 15 2017 Win64" .. ''' +
+                    flags + ''' ..
+                    msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /m:2 /p:Configuration=Debug
+                '''
+            }
+        }
+    },
+    osx: {
+        node('osx') {
+            timeout(time: 30, unit: 'MINUTES') {
+                checkout scm
+                sh 'git submodule update --init --recursive'
+                sh '''
+                    export PATH=${PATH}:/usr/local/bin:/Applications/CMake.app/Contents/bin
+                    export CMAKE_BUILD_TOOL=/Applications/CMake.app/Contents/bin/CMake
+                    srcDir=$PWD
+                    if [ ! -d ${srcDir} ]; then
+                      mkdir ${srcDir}
+                    fi
+                    if [ ! -d ${srcDir}/build ]; then
+                      mkdir ${srcDir}/build
+                    fi
+                    cd ${srcDir}/build
+                    /Applications/CMake.app/Contents/bin/cmake -G Xcode -D NASM=/usr/local/bin/nasm ${srcDir} .. ''' +
+                    flags + '''
+                    xcodebuild -quiet
+                    '''
+            }
+        }
+    }
+}
diff --git a/ext/ghoul b/ext/ghoul
index 128284f0e7..67827b142e 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 128284f0e7f6584678398efa2b9f8fac60a646ce
+Subproject commit 67827b142e95122b66d58e7c402fe1a28a65631e