Merge branch 'master' into ui
This commit is contained in:
commit
f35f3895f5
@ -11,21 +11,18 @@ executable Pioneers
|
|||||||
} else {
|
} else {
|
||||||
ghc-options: -Wall -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3 -fllvm
|
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.Types,
|
||||||
Map.Graphics,
|
Map.Graphics,
|
||||||
Map.Creation,
|
Map.Creation,
|
||||||
Map.StaticMaps,
|
Map.StaticMaps,
|
||||||
Importer.IQM.Types,
|
Importer.IQM.Types,
|
||||||
Importer.IQM.TestMain,
|
|
||||||
Importer.IQM.Parser,
|
Importer.IQM.Parser,
|
||||||
Render.Misc,
|
Render.Misc,
|
||||||
Render.Render,
|
Render.Render,
|
||||||
Render.RenderObject,
|
Render.RenderObject,
|
||||||
Render.Types,
|
Render.Types,
|
||||||
UI.Callbacks,
|
UI.Callbacks,
|
||||||
UI.Types,
|
|
||||||
UI.SurfaceOverlay
|
|
||||||
Types
|
Types
|
||||||
main-is: Main.hs
|
main-is: Main.hs
|
||||||
build-depends:
|
build-depends:
|
||||||
|
15
README.md
15
README.md
@ -10,14 +10,13 @@ Bugtracker/Wiki: http://redmine.pwning.de/projects/pioneers
|
|||||||
|
|
||||||
1. Clone this repository
|
1. Clone this repository
|
||||||
2. Set up cabal-sandbox
|
2. Set up cabal-sandbox
|
||||||
```
|
|
||||||
$ cabal sandbox init
|
$ cabal sandbox init
|
||||||
$ cd deps
|
$ cd deps
|
||||||
$ ./getDeps.sh
|
$ ./getDeps.sh
|
||||||
$ cd ..
|
$ cd ..
|
||||||
$ cabal sandbox add-source deps/hsSDL2
|
$ cabal sandbox add-source deps/hsSDL2
|
||||||
```
|
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)
|
||||||
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`
|
4. install dependencies `cabal install --only-dependencies`
|
||||||
5. build `cabal build`
|
5. build `cabal build`
|
||||||
6. run `./Pioneers`
|
6. run `./Pioneers`
|
||||||
|
Loading…
Reference in New Issue
Block a user