From f42553d0e1dc9f96ae02d7b9726a6a56dda6aebc Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 16 Oct 2024 00:31:59 +0300 Subject: [PATCH] readme: install 32-bit deps on Ubuntu with aptitude, as it's less prone to fuck up entire system (remove random packages, bootloader, etc...) [skip ci] --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 56e02e4c..6cf4f423 100644 --- a/README.md +++ b/README.md @@ -61,23 +61,24 @@ This repository contains our fork of HLSDK and restored source code for Half-Lif #### GNU/Linux ##### Debian/Ubuntu -* For 32-bit engine on 64-bit x86 operating system: +* Only for 32-bit engine on 64-bit x86 operating system: * Enable i386 on your system: `$ sudo dpkg --add-architecture i386`. - * Install development tools: `$ sudo apt install build-essential gcc-multilib g++-multilib python libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386 libopus-dev:i386 libbz2-dev:i386`. + * Install `aptitude` ([why?](https://github.com/FWGS/xash3d-fwgs/issues/1828#issuecomment-2415131759)): `$ sudo apt update && sudo apt upgrade && sudo apt install aptitude` + * Install development tools: `$ sudo aptitude --without-recommends install git build-essential gcc-multilib g++-multilib libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype-dev:i386 libopus-dev:i386 libbz2-dev:i386`. * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig`. -* For non-x86 systems: - * Install development tools: `$ sudo apt install build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`. +* For 64-bit engine on 64-bit x86 and other non-x86 systems: + * Install development tools: `$ sudo apt install git build-essential python libsdl2-dev libfontconfig-dev libfreetype6-dev libopus-dev libbz2-dev`. * Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`. ##### RedHat/Fedora -* For 32-bit engine on 64-bit x86 operating system: - * Install development tools: `$ sudo dnf install gcc gcc-c++ glibc-devel.i686 SDL2-devel.i686 opus-devel.i686 fontconfig-devel.i686 freetype-devel.i686 bzip2-devel.i686`. +* Only for 32-bit engine on 64-bit x86 operating system: + * Install development tools: `$ sudo dnf install git gcc gcc-c++ glibc-devel.i686 SDL2-devel.i686 opus-devel.i686 fontconfig-devel.i686 freetype-devel.i686 bzip2-devel.i686`. * Set PKG_CONFIG_PATH environment variable to point at 32-bit libraries: `$ export PKG_CONFIG_PATH=/usr/lib/pkgconfig`. -* For non-x86 systems: - * Install development tools: `$ sudo dnf install gcc gcc-c++ SDL2-devel opus-devel fontconfig-devel freetype-devel bzip2-devel`. +* For 64-bit engine on 64-bit x86 and other non-x86 systems: + * Install development tools: `$ sudo dnf install git gcc gcc-c++ SDL2-devel opus-devel fontconfig-devel freetype-devel bzip2-devel`. * Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.