From bd582ac84b15fdf2db97009f3ec372214060ab12 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sat, 26 Apr 2014 17:44:41 +0200 Subject: [PATCH 1/4] even more readme.. --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 39048e9..4563fb0 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,11 @@ Bugtracker/Wiki: http://redmine.pwning.de/projects/pioneers 1. Clone this repository 2. Set up cabal-sandbox - ``` - $ cabal sandbox init - $ cd deps - $ ./getDeps.sh - $ cd .. - $ cabal sandbox add-source deps/hsSDL2 - ``` + $ cabal sandbox init + $ cd deps + $ ./getDeps.sh + $ cd .. + $ cabal sandbox add-source deps/hsSDL2 3. install libraries `sudo apt-get install libsdl2` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04) 4. install dependencies `cabal install --only-dependencies` 5. build `cabal build` From 8db4004a8ff618def3ed8f182d362c9358c15635 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sat, 26 Apr 2014 20:47:36 +0200 Subject: [PATCH 2/4] readmeeeee --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 39048e9..ab6a5ce 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,14 @@ Bugtracker/Wiki: http://redmine.pwning.de/projects/pioneers 1. Clone this repository 2. Set up cabal-sandbox - ``` - $ cabal sandbox init - $ cd deps - $ ./getDeps.sh - $ cd .. - $ cabal sandbox add-source deps/hsSDL2 - ``` + + ``` + $ cabal sandbox init + $ cd deps + $ ./getDeps.sh + $ cd .. + $ cabal sandbox add-source deps/hsSDL2 + ``` 3. install libraries `sudo apt-get install libsdl2` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04) 4. install dependencies `cabal install --only-dependencies` 5. build `cabal build` From c4b5e69fcf102a9e4fb85d0ee745735c09b8d825 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sat, 26 Apr 2014 21:33:28 +0200 Subject: [PATCH 3/4] added dependencies forgotten in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d01d58..b3eccc4 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Bugtracker/Wiki: http://redmine.pwning.de/projects/pioneers $ ./getDeps.sh $ cd .. $ cabal sandbox add-source deps/hsSDL2 -3. install libraries `sudo apt-get install libsdl2` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04) +3. install libraries `sudo apt-get install libsdl2 libsdl2-dev libghc-llvm-dev` - make sure libsdl2 is in version 2.0.1+ (shipped with Ubuntu since 14.04) 4. install dependencies `cabal install --only-dependencies` 5. build `cabal build` 6. run `./Pioneers` From b3c25a132694538224adbc6db68dc2f74df2ce6e Mon Sep 17 00:00:00 2001 From: Jonas Betzendahl Date: Sun, 27 Apr 2014 22:29:20 +0200 Subject: [PATCH 4/4] Fixed Pioneers.cabal (hopefully) --- Pioneers.cabal | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Pioneers.cabal b/Pioneers.cabal index c8e8c83..4aad55e 100644 --- a/Pioneers.cabal +++ b/Pioneers.cabal @@ -11,21 +11,18 @@ executable Pioneers } else { ghc-options: -Wall -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3 -fllvm } - other-module + other-modules: Map.Types, Map.Graphics, Map.Creation, Map.StaticMaps, Importer.IQM.Types, - Importer.IQM.TestMain, Importer.IQM.Parser, Render.Misc, Render.Render, Render.RenderObject, Render.Types, UI.Callbacks, - UI.Types, - UI.SurfaceOverlay Types main-is: Main.hs build-depends: