diff --git a/mk/linux/configuration.xml b/mk/linux/configuration.xml deleted file mode 100644 index 4e4b2cc5..00000000 --- a/mk/linux/configuration.xml +++ /dev/null @@ -1,438 +0,0 @@ - - - - <file-name-main value="$APPLICATIONDATAPATH/glest.ini"/> - <file-name value="$HOME/.megaglest/glestuser.ini"/> - <icon value="true" path="$APPLICATIONDATAPATH/glest.ico"/> - <field-groups> - <field-group name="General"> - <field type="Int"> - <name value="Screen width"/> - <variable-name value="ScreenWidth"/> - <description value=""/> - <default value="800"/> - </field> - <field type="Int"> - <name value="Screen height"/> - <variable-name value="ScreenHeight"/> - <description value=""/> - <default value="600"/> - </field> - <field type="Int"> - <name value="Refresh frequency"/> - <variable-name value="RefreshFrequency"/> - <description value=""/> - <default value="60"/> - </field> - <field type="Enum"> - <name value="Color bits"/> - <variable-name value="ColorBits"/> - <description value=""/> - <default value="32"/> - <enums> - <enum value="16"/> - <enum value="24"/> - <enum value="32"/> - </enums> - </field> - <field type="Enum"> - <name value="Windowed"/> - <variable-name value="Windowed"/> - <description value="Execute in a window"/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="First time"/> - <variable-name value="FirstTime"/> - <description value=""/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="FloatRange"> - <name value="Gameplay speed maximum"/> - <variable-name value="FastSpeedLoops"/> - <description value=""/> - <default value="2"/> - <min value="0"/> - <max value="20"/> - </field> - </field-group> - - <field-group name="Renderer"> - <field type="Enum"> - <name value="Renderer"/> - <variable-name value="FactoryGraphics"/> - <description value=""/> - <default value="OpenGL"/> - <enums> - <enum value="OpenGL"/> - <enum value="OpenGL2"/> - </enums> - </field> - <field type="Enum"> - <name value="Check OpenGL version on startup"/> - <variable-name value="CheckGlCaps"/> - <description value=""/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Filter"/> - <variable-name value="Filter"/> - <description value=""/> - <default value="Bilinear"/> - <enums> - <enum value="Bilinear"/> - <enum value="Trilinear"/> - </enums> - </field> - <field type="Enum"> - <name value="Depth bits"/> - <variable-name value="DepthBits"/> - <description value="Z buffer precision"/> - <default value="16"/> - <enums> - <enum value="16"/> - <enum value="24"/> - <enum value="32"/> - </enums> - </field> - <field type="Enum"> - <name value="3D textures"/> - <variable-name value="Textures3D"/> - <description value="If enabled, 3D textures are used for water - -animation, disable on old cards"/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Shadows"/> - <variable-name value="Shadows"/> - <description value="Projected shadows are fast but only create - -units and object shadows and in some cases are incorrect. Shadow mapping creates everything - -over everything shadows, but are slow and look aliased in some cards"/> - <default value="Projected"/> - <enums> - <enum value="Disabled"/> - <enum value="Projected"/> - <enum value="ShadowMapping"/> - </enums> - </field> - <field type="Enum"> - <name value="Shadow texture size"/> - <variable-name value="ShadowTextureSize"/> - <description value="Size of the texture used for projected - -shadows and shadow mapping, bigger sizes result in less pixelized shadows but are much slower"/> - <default value="256"/> - <enums> - <enum value="256"/> - <enum value="512"/> - </enums> - </field> - <field type="FloatRange"> - <name value="Shadow alpha"/> - <variable-name value="ShadowAlpha"/> - <description value="Shadow transparency"/> - <default value="0.2"/> - <min value="0"/> - <max value="1"/> - </field> - <field type="IntRange"> - <name value="Shadow frame skip"/> - <variable-name value="ShadowFrameSkip"/> - <description value=""/> - <default value="2"/> - <min value="0"/> - <max value="5"/> - </field> - <field type="FloatRange"> - <name value="Day time"/> - <variable-name value="DayTime"/> - <description value="Day/Night cycle duration, in seconds"/> - <default value="1000.00"/> - <min value="100"/> - <max value="2000"/> - </field> - <field type="IntRange"> - <name value="Maximum lights"/> - <variable-name value="MaxLights"/> - <description value=""/> - <default value="1"/> - <min value="1"/> - <max value="8"/> - </field> - <field type="Enum"> - <name value="Fog of war smoothing"/> - <variable-name value="FogOfWarSmoothing"/> - <description value=""/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="IntRange"> - <name value="Fog of war sm. frame skip"/> - <variable-name value="FogOfWarSmoothingFrameSkip"/> - <description value=""/> - <default value="3"/> - <min value="0"/> - <max value="5"/> - </field> - <field type="Enum"> - <name value="Show Unit Particles"/> - <variable-name value="UnitParticles"/> - <description value="Displays particles on game units"/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Auto maximum screen"/> - <variable-name value="AutoMaxFullScreen"/> - <description value="Automatically use maximum screen space and resolution"/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - </field-group> - - <field-group name="Audio"> - <field type="Enum"> - <name value="Sound factory"/> - <variable-name value="FactorySound"/> - <description value=""/> - <default value="OpenAL"/> - <enums> - <enum value="DirectSound8"/> - <enum value="OpenAL"/> - </enums> - </field> - <field type="IntRange"> - <name value="FX volume"/> - <variable-name value="SoundVolumeFx"/> - <description value=""/> - <default value="80"/> - <min value="0"/> - <max value="100"/> - </field> - <field type="IntRange"> - <name value="Music volume"/> - <variable-name value="SoundVolumeMusic"/> - <description value=""/> - <default value="90"/> - <min value="0"/> - <max value="100"/> - </field> - <field type="IntRange"> - <name value="Ambient volume"/> - <variable-name value="SoundVolumeAmbient"/> - <description value=""/> - <default value="80"/> - <min value="0"/> - <max value="100"/> - </field> - </field-group> - - <field-group name="GUI"> - <field type="IntRange"> - <name value="Font Size Adjustment value"/> - <variable-name value="FontSizeAdjustment"/> - <description value="This value increases or decreases the size of the fonts in the game"/> - <default value="0"/> - <min value="0"/> - <max value="72"/> - </field> - <field type="String"> - <name value="Language"/> - <variable-name value="Lang"/> - <description value=""/> - <default value="english"/> - </field> - <field type="Enum"> - <name value="Focus arrows"/> - <variable-name value="FocusArrows"/> - <description value="If enabled, arrows are displayed under units - -when they are issued a command"/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Disable ingame UI"/> - <variable-name value="PhotoMode"/> - <description value=""/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="IntRange"> - <name value="Maximum console lines"/> - <variable-name value="ConsoleMaxLines"/> - <description value=""/> - <default value="10"/> - <min value="1"/> - <max value="50"/> - </field> - <field type="IntRange"> - <name value="Maximum stored console lines"/> - <variable-name value="ConsoleMaxLinesStored"/> - <description value=""/> - <default value="20"/> - <min value="1"/> - <max value="50"/> - </field> - <field type="IntRange"> - <name value="Console text timeout"/> - <variable-name value="ConsoleTimeout"/> - <description value=""/> - <default value="20"/> - <min value="1"/> - <max value="50"/> - </field> - - <field type="Enum"> - <name value="Disable 3D mouse pointer"/> - <variable-name value="No2DMouseRendering"/> - <description value="Use the mouse pointer provided by the operating - -system instead of a styled 3D mouse pointer."/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - </field-group> - - <field-group name="Network"> - <field type="String"> - <name value="Network player name"/> - <variable-name value="NetPlayerName"/> - <description value="Your player name for network games"/> - <default value="newbie"/> - </field> - <field type="Enum"> - <name value="Client data consistency checks"/> - <variable-name value="NetworkConsistencyChecks"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Client and Server data file synch check"/> - <variable-name value="AllowGameDataSynchCheck"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Enable Network Debugging Output"/> - <variable-name value="DebugNetwork"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - - </field-group> - - <field-group name="Advanced"> - <field type="Enum"> - <name value="Debug mode"/> - <variable-name value="DebugMode"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Enable Performance Debugging Output"/> - <variable-name value="DebugPerformance"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="String"> - <name value="Debug LogFile"/> - <variable-name value="DebugLogFile"/> - <description value="Debug LogFile to save debug output"/> - <default value="debug.log"/> - </field> - <field type="IntRange"> - <name value="AI log"/> - <variable-name value="AiLog"/> - <description value=""/> - <default value="0"/> - <min value="0"/> - <max value="4"/> - </field> - <field type="Enum"> - <name value="AI log console redirection"/> - <variable-name value="AiRedir"/> - <description value=""/> - <default value="false"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - <field type="Enum"> - <name value="Allow players to rotate Units when building new Units"/> - <variable-name value="AllowRotateUnits"/> - <description value=""/> - <default value="true"/> - <enums> - <enum value="true"/> - <enum value="false"/> - </enums> - </field> - - <field type="String"> - <name value="User created Data Folder"/> - <variable-name value="UserData_Root"/> - <description value=""/> - <default value=""/> - </field> - </field-group> - </field-groups> -</configuration> diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh index 611deeed..434fd9ef 100755 --- a/mk/linux/makedeps_folder.sh +++ b/mk/linux/makedeps_folder.sh @@ -22,7 +22,7 @@ sync_support_libs(){ local _cp="/bin/cp" #local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL" local skip_deps="" - local keep_deps="libcurl libgnu libicu liblua libxerces libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc" + local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl" local scan_via_skiplist=1 diff --git a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh index 611deeed..434fd9ef 100755 --- a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh +++ b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh @@ -22,7 +22,7 @@ sync_support_libs(){ local _cp="/bin/cp" #local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL" local skip_deps="" - local keep_deps="libcurl libgnu libicu liblua libxerces libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc" + local keep_deps="libcurl libgnu libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc libssl" local scan_via_skiplist=1 diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index d755e9e5..a02127c3 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -166,7 +166,7 @@ case $distribution in fi ;; *) - alternative='apt-get install build-essential subversion automake autoconf autogen cmake cmake-curses-gui; apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libluajit-5.1-dev libftgl-dev libminiupnpc-dev libvlc-dev librtmp-dev libgtk2.0-dev' + alternative='apt-get install build-essential subversion automake autoconf autogen cmake cmake-curses-gui; apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libminiupnpc-dev libvlc-dev librtmp-dev libgtk2.0-dev' unsupported_release exit 1 ;; @@ -178,24 +178,24 @@ case $distribution in 8.04) apt-get install build-essential subversion automake autoconf autogen cmake if [ $? != 0 ]; then error_during_installation; exit 1; fi - apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libluajit-5.1-dev libftgl-dev + apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev if [ $? != 0 ]; then error_during_installation; exit 1; fi ;; 10.04) apt-get install build-essential subversion automake autoconf autogen cmake if [ $? != 0 ]; then error_during_installation; exit 1; fi - apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libluajit-5.1-dev libftgl-dev + apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew1.5-dev libftgl-dev if [ $? != 0 ]; then error_during_installation; exit 1; fi ;; 11.10|12.04|12.10) apt-get install build-essential subversion automake autoconf autogen cmake if [ $? != 0 ]; then error_during_installation; exit 1; fi - apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libluajit-5.1-dev libftgl-dev libvlc-dev + apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libvlc-dev if [ $? != 0 ]; then error_during_installation; exit 1; fi ;; *) - alternative='apt-get install build-essential subversion automake autoconf autogen cmake; apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libluajit-5.1-dev libftgl-dev libvlc-dev' + alternative='apt-get install build-essential subversion automake autoconf autogen cmake; apt-get install libsdl1.2-dev libxerces-c2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libvlc-dev' unsupported_release exit 1 ;; diff --git a/mk/linux/start_megaglest b/mk/linux/start_megaglest index 2de22883..960a42f8 100755 --- a/mk/linux/start_megaglest +++ b/mk/linux/start_megaglest @@ -198,6 +198,10 @@ VLCCORE_LINKEDLIBNAME='libvlccore.so.5' VLCCORE_LIBLOOKUP1=${VLCCORE_LINKEDLIBNAME} VLCCORE_LIBLOOKUP2='libvlccore.so.' +SSL_LINKEDLIBNAME='libssl.so.0.9.8' +SSL_LIBLOOKUP1=${SSL_LINKEDLIBNAME} +SSL_LIBLOOKUP2='libssl.so.' + if [ "$OS_TYPE"'_' = 'x86_64_' ]; then DIRECTFB_LINKEDLIBNAME='libdirectfb-1.2.so.0' DIRECTFB_LIBLOOKUP1=${DIRECTFB_LINKEDLIBNAME} @@ -269,6 +273,7 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${IRC_LINKEDLIBNAME}" "$IRC_LIBLOOKU findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${DL_LINKEDLIBNAME}" "$DL_LIBLOOKUP1" "$DL_LIBLOOKUP2" findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLCCORE_LINKEDLIBNAME}" "$VLCCORE_LIBLOOKUP1" "$VLCCORE_LIBLOOKUP2" findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${VLC_LINKEDLIBNAME}" "$VLC_LIBLOOKUP1" "$VLC_LIBLOOKUP2" +findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${SSL_LINKEDLIBNAME}" "$SSL_LIBLOOKUP1" "$SSL_LIBLOOKUP2" ./megaglest $@