Merge branch 'tessallation' into mapmerge

Conflicts: src/Main.hs src/Map/Graphics.hs
2014-03-05 15:02:30 +01:00
parent d3e450c7b0 5a70a22da6
commit e6c6442c85
17 changed files with 987 additions and 298 deletions
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@ -6,7 +6,7 @@ author:         sdressel

 executable Pioneers
  hs-source-dirs:  src
-  ghc-options:     -Wall
+  ghc-options:     -Wall -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3 -fllvm
  other-modules:   
                   Map.Types,
                   Map.Graphics,
@ -14,7 +14,9 @@ executable Pioneers
                   Map.StaticMaps,
                   Render.Misc,
                   Render.Render,
-                   Render.RenderObject
+                   Render.RenderObject,
+                   UI.Callbacks,
+                   Types
  main-is:         Main.hs
  build-depends:   
                   base >=4.6,
@ -32,5 +34,6 @@ executable Pioneers
                   linear >=1.3.1 && <1.4,
                   lens >=3.10.1 && <3.11,
                   SDL2 >= 0.1.0,
-                   time >=1.4.0 && <1.5
+                   time >=1.4.0 && <1.5,
+                   fclabels >=2.0.0 && <3