From 8c72cc14e0753a69e92c6b7cb5bb549c72a51c3a Mon Sep 17 00:00:00 2001 From: Rafael Ristovski Date: Sun, 22 Mar 2015 21:49:36 +0000 Subject: [PATCH] Updated dependencies and added dep list for Archlinux, updated msysgit and remote-branch tutorial links, minor edits to style. --- ...ry_Access.md => Repository_Access.markdown | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) rename Repository_Access.md => Repository_Access.markdown (76%) diff --git a/Repository_Access.md b/Repository_Access.markdown similarity index 76% rename from Repository_Access.md rename to Repository_Access.markdown index b5e8a45..49dfe5d 100644 --- a/Repository_Access.md +++ b/Repository_Access.markdown @@ -5,7 +5,7 @@ Xonotic uses several Git repositories. There’s a helper script in the main rep The repository also contains several branches next to the stable “master” branch. So if you’re interested in the progress of a certain feature, or want to help or create a new one, you can checkout the appropriate branch. For information on how to obtain write access, skip down to the “[Getting write access](Repository_Access#contributing-and-getting-write-access)” section. -For more information about Git we have a [Git](Git) page on the wiki [here](Git). +For more information about Git we have a page on the wiki [here](Git). Setting up the development environment -------------------------------------- @@ -16,21 +16,25 @@ The first thing you must do in order to begin development is set up your system Linux already has an adequate base for development, all we really need to do here is install the dependencies for the download/compilation process and then we can move right along to cloning the data. -Ubuntu Dependencies (independent package x11-proto-devel dependencies fill the rest of the Debian package dependencies): +**Ubuntu Dependencies** (independent package x11-proto-devel dependencies fill the rest of the Debian package dependencies): - sudo apt-get install build-essential xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl1.2-dev libsdl-image1.2-dev libclalsadrv-dev libasound2-dev libxext-dev libsdl1.2debian libjpeg-turbo8-dev git-core unzip wget + sudo apt-get install build-essential xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl2-dev libsdl2-image-dev libclalsadrv-dev libasound2-dev libxext-dev libjpeg-turbo8-dev git-core unzip wget -Note: If using i386 architecture, you can replace libdsl1.2debian by ibsdl1.2debian:i386 in the list above. On Debian, use libjpeg8-dev if libjpeg-turbo8-dev isn’t available in the package repositories. To be able to download maps from game servers when using Xonotic for online gaming, you will also need curl installed on your system. +Note: If using **i386** architecture, you can replace libdsl1.2debian by libsdl1.2debian:**i386** in the list above. On Debian, use libjpeg8-dev if libjpeg-turbo8-dev isn’t available in the package repositories. To be able to download maps from game servers when using Xonotic for online gaming, you will also need **curl** installed on your system. -For Fedora and other RPM based distro’s, compiling dependencies are as follows: +For **Fedora** and other **RPM based** distro’s, compiling dependencies are as follows: - x11-proto-devel, libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL-devel + x11-proto-devel, libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL2-devel + +For **Archlinux** the dependencies can be installed via the following command: + + sudo pacman -S alsa-lib curl libjpeg-turbo libmodplug libpng libvorbis libxpm libxxf86dga libxxf86vm sdl2 ### Windows -By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic… So, what we have to do is install something called [msysgit](https://code.google.com/p/msysgit/downloads/list) to allow us to have a similar environment as on Linux. In this case, we want the download which is entirely self contained (including build-essentials and other corely required dependencies), which at the time of writing this is called “msysGit-fullinstall-1.8.0-preview20121022.exe.” Simply follow the instructions on screen at this point. NOTE: Unless you know what you’re doing, install with default settings/directories. +By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic… So, what we have to do is install something called [msysgit](https://github.com/msysgit/msysgit/releases) to allow us to have a similar environment as on Linux. In this case, we want the download which is entirely self contained (including build-essentials and other corely required dependencies), which at the time of writing this is called “msysGit-netinstall-1.9.5-preview20150319.exe.” Simply follow the instructions on screen at this point. NOTE: Unless you know what you’re doing, install with default settings/directories. -Once you have completed the installation, you should be able to launch the msysgit shell by simply finding “msys.bat”- by default, it is located at: C:.bat, and you can use this shell to continue on with the guide and clone and compile the Xonotic repositories. It is recommended that you make a shortcut to msysgit (simply right click the shell and hit “Create Shortcut”) for easier access on your desktop or in your start menu. +Once you have completed the installation, you should be able to launch the msysgit shell by simply finding “msys.bat”- by default, it is located at: C:, and you can use this shell to continue on with the guide and clone and compile the Xonotic repositories. It is recommended that you make a shortcut to msysgit (simply right click the shell and hit “Create Shortcut”) for easier access on your desktop or in your start menu. ### Mac OSX @@ -38,6 +42,7 @@ You must first install XCode which comes on your installation DVD or can be down After your development environment is all set up, you can continue on to cloning the git repository and compiling Xonotic. + Cloning the repository and compiling ------------------------------------ @@ -72,6 +77,7 @@ To update your Git clone, you can repeat the commands above without the first ./all update ./all compile + Contributing and getting write access ------------------------------------- @@ -136,7 +142,7 @@ Further git information ----------------------- About tracking remote branches: -http://www.gitready.com/beginner/2009/03/09/remote-tracking-branches.html +http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches This wiki’s [Git](Git) page. -- 2.39.2