update submodules, gitignore, install script
This commit is contained in:
parent
5b917b7752
commit
52df8314d0
2
.gitignore
vendored
2
.gitignore
vendored
@ -246,6 +246,8 @@ ModelManifest.xml
|
|||||||
*.o
|
*.o
|
||||||
*.d
|
*.d
|
||||||
|
|
||||||
|
.settings/*
|
||||||
|
|
||||||
# Don't ignore binary resource files
|
# Don't ignore binary resource files
|
||||||
!res/bin/*
|
!res/bin/*
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
||||||
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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 "${INPUTS}"" 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 "${INPUTS}"" prefer-non-shared="true">
|
||||||
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
||||||
<language-scope id="org.eclipse.cdt.core.g++"/>
|
<language-scope id="org.eclipse.cdt.core.g++"/>
|
||||||
</provider>
|
</provider>
|
||||||
|
2
libglez
2
libglez
@ -1 +1 @@
|
|||||||
Subproject commit dd1055e0e900d942619f036742659225515d127a
|
Subproject commit 35e0841d5ee9d885013e47ce72e155bd22cf7a98
|
@ -1 +1 @@
|
|||||||
Subproject commit 72ecdb8a808caeac7c676efac845d815f16dd923
|
Subproject commit ad74113459abc092f81cb56ecd77909d17a22e0d
|
@ -6,4 +6,4 @@
|
|||||||
|
|
||||||
DEPENDS_LIBRARIES=(ssl m rt GL freetype GLEW png X11 Xext pthread Xfixes);
|
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_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");
|
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");
|
@ -31,11 +31,15 @@ gauge_deps_packages ()
|
|||||||
return 0
|
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
|
gauge_deps_packages | whiptail --title "Installing packages" --gauge "Please wait" 6 78 0
|
||||||
|
|
||||||
$DIALOG --title "Success" --msgbox "Installed successfully." 8 78
|
$DIALOG --title "Success" --msgbox "Installed successfully." 8 78
|
||||||
|
|
||||||
|
|
||||||
if ! [ ${PIPESTATUS[0]} == 0 ]; then
|
if ! [ ${PIPESTATUS[0]} == 0 ]; then
|
||||||
$DIALOG --title "Error: error" --msgbox "It appears that you have error. Please fix it." 8 78
|
$DIALOG --title "Error: error" --msgbox "It appears that you have error. Please fix it." 8 78
|
||||||
fi
|
fi
|
@ -1 +1 @@
|
|||||||
Subproject commit 329e0eb378065c9018abd16f1707e8540147de6c
|
Subproject commit 76778dc3ce5ce2e1af08ef065753114a95df0cfb
|
Reference in New Issue
Block a user