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

Merge branch 'tessallation'

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-05-10 17:35:35 +02:00
commit 5e72dbedd0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
COMPILING
View File

@ -1,6 +1,13 @@
# on ubuntu14.04 (trusty) and later
just run
> ./build.sh
# manual installation
set up external dependencies: set up external dependencies:
> sudo apt-get install libsdl2-dev > sudo apt-get install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev
> cd deps && ./getDeps.sh && cd .. > cd deps && ./getDeps.sh && cd ..
NOTE: ubuntu saucy currently only has libsdl2-dev.2.0.0 in the repositories, but we need libsdl2-dev.2.0.1 NOTE: ubuntu saucy currently only has libsdl2-dev.2.0.0 in the repositories, but we need libsdl2-dev.2.0.1
@ -12,8 +19,8 @@ make sure the compiled files are in your PATH (e.g. include $HOME/.cabal/bin in
install dependencies & configure app install dependencies & configure app
> cabal sandbox init > cabal sandbox init
> cabal sandbox --add-source deps/hsSDL2 > cabal sandbox add-source deps/hsSDL2
> cabal sandbox --add-source deps/hsSDL2-ttf > cabal sandbox add-source deps/hsSDL2-ttf
> cabal install --only-dependencies > cabal install --only-dependencies
> cabal configure > cabal configure

4
src/Render/Render.hs
View File

@ -389,10 +389,6 @@ render = do
glDrawArrays gl_PATCHES 0 (fromIntegral numVert) glDrawArrays gl_PATCHES 0 (fromIntegral numVert)
currentProgram $= Just (state ^. gl.glMap.objectProgram)
checkError "draw map" checkError "draw map"
---- RENDER MAPOBJECTS -------------------------------------------- ---- RENDER MAPOBJECTS --------------------------------------------