From fd49179524057602e0797c1ef40f3b98915223ea Mon Sep 17 00:00:00 2001 From: Fuzzik Date: Mon, 11 Aug 2014 09:43:39 -0700 Subject: [PATCH] Revert 9cff8f8^ ... 9cff8f8 on Building for Linux --- Building-for-Linux.md | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/Building-for-Linux.md b/Building-for-Linux.md index 8a370be..3ef0c72 100644 --- a/Building-for-Linux.md +++ b/Building-for-Linux.md @@ -7,26 +7,15 @@ Dolphin runs on 64-bit Linux distributions. These instructions explain how to bu ## Step 1 – Install the Correct Dependencies --- -**Debian-based distributions (Ubuntu, Linux Mint, etc.)** -`sudo apt-get install cmake git g++ libwxbase3.0-dev libwxgtk3.0-dev libgtk2.0-dev libxrandr-dev libxext-dev libao-dev libasound2-dev libpulse-dev libbluetooth-dev libreadline-gplv2-dev libavcodec-dev libavformat-dev libswscale-dev` +**Ubuntu 12.04 and newer** +`sudo apt-get install cmake git g++ wx2.8-headers libwxbase2.8-dev libwxgtk2.8-dev libgtk2.0-dev libsdl1.2-dev libxrandr-dev libxext-dev libao-dev libasound2-dev libpulse-dev libbluetooth-dev libreadline-gplv2-dev libavcodec-dev libavformat-dev libswscale-dev` + +**Ubuntu 11.04** +`sudo apt-get install cmake git g++ wx2.8-headers libwxbase2.8-dev libwxgtk2.8-dev libgtk2.0-dev libsdl1.2-dev libxrandr-dev libxext-dev libao-dev libasound2-dev libpulse-dev libbluetooth-dev libreadline5-dev libavcodec-dev libavformat-dev libswscale-dev` **Other Linux versions** See the [build dependencies](#build-dependencies) below for a list of packages you will need to install. -**Installing SDL** - -Note: SDL 2.0 must be compiled from source to prevent a bug causing Dolphin to crash with rumble-enabled controllers. - -Install Mercurial (`sudo apt-get install hg`), and clone the SDL repo to the directory of your choice: -``` -cd /tmp; hg clone http://hg.libsdl.org/SDL -``` - -Build SDL and install: -``` -cd SDL; ./configure && make && sudo make install -``` - ## Step 2 – Get the Dolphin Repository --- @@ -96,8 +85,9 @@ Most of the time, any problems in the build process are due to user error. It's - git - cmake - g++ -- libwxbase3.0-dev -- libwxgtk3.0-dev +- wx2.9-headers (wx3.0-headers work too, and are perhaps preferred!) +- libwxbase2.8-dev +- libwxgtk2.8-dev - libgtk2.0-dev - libbluetooth-dev (optional, for real Wiimotes) - libxrandr-dev (optional, for switching desktop resolution in fullscreen mode) @@ -111,6 +101,6 @@ Most of the time, any problems in the build process are due to user error. It's - libavformat-dev (optional, for dumping frames in AVI format) - libswscale-dev (optional, for dumping frames in AVI format) - liblzo2-dev (optional, if not found will be built statically) +- libsdl1.2-dev (optional, if not found will be built statically) - libsoil-dev (optional, if not found will be built statically) - libsfml-dev (optional, if not found will be built statically) -- SDL 2.0 (build from source to avoid a bug with rumble-enabled controllers) \ No newline at end of file