From f652d6c738a400fe2972605a0742ebc846216da0 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 18 Jan 2022 02:09:47 -0500
Subject: [PATCH] fix devendor again and prepare for 0.4.2

---
 CMakeLists.txt      | 14 ++++++++++----
 res/Info.plist      |  6 +++---
 src/engine/engine.h |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a446a27..f6c83e69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_PROJECT_VERSION_MAJOR 0)
 set(CMAKE_PROJECT_VERSION_MINOR 4)
-set(CMAKE_PROJECT_VERSION_PATCH 1)
+set(CMAKE_PROJECT_VERSION_PATCH 2)
 
 if (ANDROID)
   set(BUILD_GUI OFF)
@@ -32,9 +32,15 @@ if (NOT DEVENDOR_LIBRARIES)
 endif()
 
 if (DEVENDOR_LIBRARIES)
-  find_package(SDL REQUIRED)
-  set(HAVE_SDL2 ${SDL_LIBRARY})
-  include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL_INCLUDE_DIR})
+  find_package(SDL)
+  if (SDL_FOUND)
+    set(HAVE_SDL2 ${SDL_LIBRARY})
+    include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL_INCLUDE_DIR})
+  else()
+    find_package(SDL2 REQUIRED)
+    set(HAVE_SDL2 ${SDL2_LIBRARY})
+    include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL2_INCLUDE_DIRS})
+  endif()
   find_library(HAVE_JACK jack)
 else()
   if (WIN32)
diff --git a/res/Info.plist b/res/Info.plist
index 2ac7618d..64a95fe5 100644
--- a/res/Info.plist
+++ b/res/Info.plist
@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.2</string>
 	<key>CFBundleName</key>
 	<string>Furnace</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.1</string>
+	<string>0.4.2</string>
 	<key>NSHumanReadableCopyright</key>
 	<string></string>
 	<key>NSHighResolutionCapable</key>
diff --git a/src/engine/engine.h b/src/engine/engine.h
index cc348ce8..128aad2f 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -10,8 +10,8 @@
 #include <map>
 #include <queue>
 
-#define DIV_VERSION "0.4.1"
-#define DIV_ENGINE_VERSION 21
+#define DIV_VERSION "0.4.2"
+#define DIV_ENGINE_VERSION 22
 
 enum DivStatusView {
   DIV_STATUS_NOTHING=0,