Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sdl2 (raw) not used due to clash with SDL2 (hsSDL2), packet-dependencies removed until further problems reoccour

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-01-20 15:03:20 +01:00
parent 91b11497dd
commit c01c776e94
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Pioneers.cabal
View File

@ -28,6 +28,5 @@ executable Pioneers
distributive >=0.3.2 && <0.4, distributive >=0.3.2 && <0.4,
linear >=1.3.1 && <1.4, linear >=1.3.1 && <1.4,
lens >=3.10.1 && <3.11, lens >=3.10.1 && <3.11,
sdl2 >= 1.0.2 && <2.0,
SDL2 >= 0.1.0 SDL2 >= 0.1.0

34
deps/getDeps.sh vendored
View File

@ -29,21 +29,21 @@ done
#hack until saucy has 2.0.1 instead of 2.0.0 #hack until saucy has 2.0.1 instead of 2.0.0
dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50 #dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50
install=${?} #install=${?}
#
if [[ $install -eq 0 ]] #if [[ $install -eq 0 ]]
then #then
echo "installing libsdl2.0.1" # echo "installing libsdl2.0.1"
if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] # if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
then # then
wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb # wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb # sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
fi # fi
if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ] # if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
then # then
wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb # wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb # sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
fi # fi
fi #fi

2
src/Main.hs
View File

@ -22,7 +22,7 @@ import Control.Lens (transposeOf, (^.))
import Linear as L import Linear as L
-- GUI -- GUI
import Graphics.UI.SDL import Graphics.UI.SDL
-- Render -- Render
import qualified Graphics.Rendering.OpenGL.GL as GL import qualified Graphics.Rendering.OpenGL.GL as GL