Merge pull request #449 from TotallyNotElite/master

Improve install script and readme.md
This commit is contained in:
LightCat 2018-05-20 12:23:30 +02:00 committed by GitHub
commit 50356f36f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions

View File

@ -35,14 +35,10 @@ and a lot of useful features, including
# INSTALLATION
## Automatic:
If you already downloaded the repo, simply run
* `install-all`
## Automatic: (Ubuntu based only)
Run in terminal:
Else simply run:
* `git clone --recursive https://github.com/nullworks/One-in-all-cathook-install/blob/master/install-all.git`
and run it's install-all script.
* `wget https://raw.githubusercontent.com/nullworks/cathook/master/install-all && bash install-all`
## Manual:
You need CMake to build cathook, CMake should take care of dependencies

View File

@ -2,7 +2,7 @@
# Install base Dependencies
#
sudo apt update && sudo apt install build-essential gcc-multilib g++-multilib software-properties-common -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install gcc-snapshot g++-6-multilib gcc-6 g++-6 -y && sudo apt update && sudo apt install git libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt update && sudo apt install build-essential git gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-6-multilib gcc-6 g++-6 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y
#
# Install libglez
@ -26,4 +26,4 @@ git clone --recursive https://github.com/nullworks/simple-ipc.git;cd simple-ipc;
# Build cathook
#
mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo);make data
git clone --recursive https://github.com/nullworks/cathook.git;cd cathook;mkdir build;cd build;cmake ..;make -j$(grep -c '^processor' /proc/cpuinfo); sudo make data