From 52df8314d036345739c74ce0694e73069528844d Mon Sep 17 00:00:00 2001
From: nullifiedcat <nullifiedcat@gmail.com>
Date: Sun, 10 Dec 2017 12:48:02 +0300
Subject: [PATCH] update submodules, gitignore, install script

---
 .gitignore                      | 2 ++
 .settings/language.settings.xml | 2 +-
 libglez                         | 2 +-
 libxoverlay                     | 2 +-
 scripts/depends                 | 2 +-
 scripts/depinstall              | 6 +++++-
 source-sdk-2013                 | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 397ee2f5..24c1e8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,6 +246,8 @@ ModelManifest.xml
 *.o
 *.d
 
+.settings/*
+
 # Don't ignore binary resource files
 !res/bin/*
 
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 2c38dd00..2637df76 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1524654426860045198" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1065247415478839562" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/libglez b/libglez
index dd1055e0..35e0841d 160000
--- a/libglez
+++ b/libglez
@@ -1 +1 @@
-Subproject commit dd1055e0e900d942619f036742659225515d127a
+Subproject commit 35e0841d5ee9d885013e47ce72e155bd22cf7a98
diff --git a/libxoverlay b/libxoverlay
index 72ecdb8a..ad741134 160000
--- a/libxoverlay
+++ b/libxoverlay
@@ -1 +1 @@
-Subproject commit 72ecdb8a808caeac7c676efac845d815f16dd923
+Subproject commit ad74113459abc092f81cb56ecd77909d17a22e0d
diff --git a/scripts/depends b/scripts/depends
index f9d19a47..59e0768d 100755
--- a/scripts/depends
+++ b/scripts/depends
@@ -6,4 +6,4 @@
 
 DEPENDS_LIBRARIES=(ssl m rt GL freetype GLEW png X11 Xext pthread Xfixes);
 DEPENDS_HEADERS=("SDL2/SDL.h" "freetype2/freetype/config/ftheader.h" "openssl/err.h" "GL/gl.h" "GL/glew.h");
-DEPENDS_PACKAGES=("gcc-6" "g++-6" "gcc-6-multilib" "g++-6-multilib" "libssl-dev:i386" "libsdl2-dev" "libfreetype6-dev" "libfreetype6-dev:i386" "libglew-dev" "libglew-dev:i386");
\ No newline at end of file
+DEPENDS_PACKAGES=("gcc-6" "g++-6" "gcc-6-multilib" "g++-6-multilib" "libssl-dev:i386" "libsdl2-dev" "libfreetype6-dev" "libfreetype6-dev:i386" "libglew-dev" "libglew-dev:i386" "libpng-dev" "libpng-dev:i386");
\ No newline at end of file
diff --git a/scripts/depinstall b/scripts/depinstall
index 1e4721c3..139a85a7 100755
--- a/scripts/depinstall
+++ b/scripts/depinstall
@@ -31,11 +31,15 @@ gauge_deps_packages ()
     return 0
 }
 
+if ! package_exists "gksu"; then
+    $DIALOG --title "gksu not installed" --msgbox "You should install gksu first. Do that with\nsudo apt install gksu" 9 78
+    exit
+fi
+
 gauge_deps_packages | whiptail --title "Installing packages" --gauge "Please wait" 6 78 0
 
 $DIALOG --title "Success" --msgbox "Installed successfully." 8 78
 
-
 if ! [ ${PIPESTATUS[0]} == 0 ]; then
     $DIALOG --title "Error: error" --msgbox "It appears that you have error. Please fix it." 8 78
 fi
\ No newline at end of file
diff --git a/source-sdk-2013 b/source-sdk-2013
index 329e0eb3..76778dc3 160000
--- a/source-sdk-2013
+++ b/source-sdk-2013
@@ -1 +1 @@
-Subproject commit 329e0eb378065c9018abd16f1707e8540147de6c
+Subproject commit 76778dc3ce5ce2e1af08ef065753114a95df0cfb