From 8e564bd08ffae0a63edc7638a5e5df504c996e20 Mon Sep 17 00:00:00 2001 From: Bertram Felgenhauer Date: Wed, 18 Jun 2008 20:16:53 +0200 Subject: [PATCH] Fix cabal file and make building with ghc 6.6.1 work. --- hs-pgms.cabal | 33 +++++++++++++++++++++++++++------ src/GUI.hs | 2 -- src/Main.hs | 2 -- src/Mine.hs | 2 -- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/hs-pgms.cabal b/hs-pgms.cabal index 9f431c4..150cff4 100644 --- a/hs-pgms.cabal +++ b/hs-pgms.cabal @@ -1,5 +1,5 @@ Name: hs-pgms -Version: 0.1 +Version: 0.1.0.1 Stability: experimental Copyright: (c) 2008 Bertram Felgenhauer Maintainer: Bertram Felgenhauer @@ -12,21 +12,42 @@ Description: and run them in a graphical UI. Inspired by . -Cabal-Version: >=1.2 +Cabal-Version: >= 1.4 Build-Type: Simple -- Data-Dir: data Data-Files: data/icons.png Extra-Source-Files: README, statistics +Flag split-base + Library HS-Source-Dirs: src Exposed-Modules: Mine -Executable mine + Build-Depends: MonadPrompt >= 1.0.0.1, mtl + + if flag(split-base) + Build-Depends: base >= 3, array, random + else + Build-Depends: base < 3 + + Extensions: GADTs, FlexibleContexts, Rank2Types, + GeneralizedNewtypeDeriving, BangPatterns + +Executable hs-pgms HS-Source-Dirs: src Main-is: Main.hs - Other-Modules: Mine, SimpleStrat, Strat1, Util, - GUI, GUI.Common, GUI.Config, GUI.Stats - Build-Depends: base, MonadPrompt, array, mtl, random, glib, gtk, directory + Other-Modules: Mine, Util, Strategies, + GUI, GUI.Common, GUI.Config, GUI.Stats, + SimpleStrat, Strat1 + Build-Depends: MonadPrompt >= 1.0.0.1, glib, gtk + + if flag(split-base) + Build-Depends: base >= 3, array, mtl, random, directory + else + Build-Depends: base < 3, mtl + GHC-Options: -threaded + Extensions: GADTs, FlexibleContexts, Rank2Types, + GeneralizedNewtypeDeriving, BangPatterns diff --git a/src/GUI.hs b/src/GUI.hs index d5fa518..9d1aeec 100644 --- a/src/GUI.hs +++ b/src/GUI.hs @@ -10,8 +10,6 @@ -- This module is part of Haskell PGMS. -- -{-# LANGUAGE GADTs, BangPatterns #-} - module GUI ( mainGUI, ) where diff --git a/src/Main.hs b/src/Main.hs index 1fc2d23..21dcb2e 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -10,8 +10,6 @@ -- This module is part of Haskell PGMS. -- -{-# LANGUAGE GeneralizedNewtypeDeriving, GADTs, BangPatterns #-} - module Main (main) where import Mine diff --git a/src/Mine.hs b/src/Mine.hs index d8c6380..04d3dbc 100644 --- a/src/Mine.hs +++ b/src/Mine.hs @@ -13,8 +13,6 @@ -- strategies. It's the core of PGMS. -- -{-# LANGUAGE GADTs, FlexibleContexts, Rank2Types, GeneralizedNewtypeDeriving #-} - module Mine ( -- * Minesweeper configurations Config (..), -- 2.11.4.GIT