Make 'linear' dependency optional

Via 'nolinear' flag.

Author: cloudhead

sdl2.cabal

@@ -44,6 +44,11 @@ flag examples
   description:       Build examples
   default:           False
 
+flag nolinear
+  description:       Do not depend on 'linear' library
+  default:           False
+  manual:            True
+
 library
   ghc-options: -Wall
 
@@ -86,6 +91,7 @@ library
   other-modules:
     Data.Bitmask
     SDL.Internal.Numbered
+    SDL.Internal.Vect
     SDL.Exception
 
   hs-source-dirs:
@@ -116,6 +122,12 @@ library
     transformers >= 0.2 && < 0.6,
     vector >= 0.10.9.0 && < 0.12
 
+  if flag(nolinear)
+    cpp-options: -Dnolinear
+  else
+    build-depends:
+      linear >= 1.10.1.2 && < 1.21
+
   default-language:
     Haskell2010
 

src/SDL/Internal/Vect.hs

@@ -0,0 +1,80 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+module SDL.Internal.Vect
+    ( V2(..)
+    , V3(..)
+    , V4(..)
+    ) where
+
+-- Copied from the 'linear' package by Edward Kmett.
+
+import           Control.Applicative (liftA2)
+import           Foreign.Storable
+import           Foreign.Ptr (castPtr)
+
+data V2 a = V2 !a !a
+    deriving (Show, Read, Ord, Eq)
+
+data V3 a = V3 !a !a !a
+    deriving (Show, Read, Ord, Eq)
+
+data V4 a = V4 !a !a !a !a
+    deriving (Show, Read, Ord, Eq)
+
+instance Functor V2 where
+  fmap f (V2 a b) = V2 (f a) (f b)
+  {-# INLINE fmap #-}
+  a <$ _ = V2 a a
+  {-# INLINE (<$) #-}
+
+instance Functor V3 where
+  fmap f (V3 a b c) = V3 (f a) (f b) (f c)
+  {-# INLINE fmap #-}
+  a <$ _ = V3 a a a
+  {-# INLINE (<$) #-}
+
+instance Functor V4 where
+  fmap f (V4 a b c d) = V4 (f a) (f b) (f c) (f d)
+  {-# INLINE fmap #-}
+  a <$ _ = V4 a a a a
+  {-# INLINE (<$) #-}
+
+instance Applicative V2 where
+    pure a = V2 a a
+    V2 a b <*> V2 d e = V2 (a d) (b e)
+
+instance Storable a => Storable (V4 a) where
+  sizeOf _ = 4 * sizeOf (undefined::a)
+  {-# INLINE sizeOf #-}
+  alignment _ = alignment (undefined::a)
+  {-# INLINE alignment #-}
+  poke ptr (V4 x y z w) = do poke ptr' x
+                             pokeElemOff ptr' 1 y
+                             pokeElemOff ptr' 2 z
+                             pokeElemOff ptr' 3 w
+    where ptr' = castPtr ptr
+  {-# INLINE poke #-}
+  peek ptr = V4 <$> peek ptr' <*> peekElemOff ptr' 1
+                <*> peekElemOff ptr' 2 <*> peekElemOff ptr' 3
+    where ptr' = castPtr ptr
+  {-# INLINE peek #-}
+
+instance Storable a => Storable (V2 a) where
+  sizeOf _ = 2 * sizeOf (undefined::a)
+  {-# INLINE sizeOf #-}
+  alignment _ = alignment (undefined::a)
+  {-# INLINE alignment #-}
+  poke ptr (V2 x y) = poke ptr' x >> pokeElemOff ptr' 1 y
+    where ptr' = castPtr ptr
+  {-# INLINE poke #-}
+  peek ptr = V2 <$> peek ptr' <*> peekElemOff ptr' 1
+    where ptr' = castPtr ptr
+  {-# INLINE peek #-}
+
+instance Num a => Num (V2 a) where
+    (+) = liftA2 (+)
+    (-) = liftA2 (-)
+    (*) = liftA2 (*)
+    negate = fmap negate
+    abs = fmap abs
+    signum = fmap signum
+    fromInteger = pure . fromInteger

src/SDL/Vect.hs

@@ -1,80 +1,11 @@
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP #-}
 module SDL.Vect
-    ( V2(..)
-    , V3(..)
-    , V4(..)
-    ) where
-
--- Copied from the 'linear' package by Edward Kmett.
-
-import           Control.Applicative (liftA2)
-import           Foreign.Storable
-import           Foreign.Ptr (castPtr)
-
-data V2 a = V2 !a !a
-    deriving (Show, Read, Ord, Eq)
-
-data V3 a = V3 !a !a !a
-    deriving (Show, Read, Ord, Eq)
-
-data V4 a = V4 !a !a !a !a
-    deriving (Show, Read, Ord, Eq)
-
-instance Functor V2 where
-  fmap f (V2 a b) = V2 (f a) (f b)
-  {-# INLINE fmap #-}
-  a <$ _ = V2 a a
-  {-# INLINE (<$) #-}
-
-instance Functor V3 where
-  fmap f (V3 a b c) = V3 (f a) (f b) (f c)
-  {-# INLINE fmap #-}
-  a <$ _ = V3 a a a
-  {-# INLINE (<$) #-}
-
-instance Functor V4 where
-  fmap f (V4 a b c d) = V4 (f a) (f b) (f c) (f d)
-  {-# INLINE fmap #-}
-  a <$ _ = V4 a a a a
-  {-# INLINE (<$) #-}
-
-instance Applicative V2 where
-    pure a = V2 a a
-    V2 a b <*> V2 d e = V2 (a d) (b e)
-
-instance Storable a => Storable (V4 a) where
-  sizeOf _ = 4 * sizeOf (undefined::a)
-  {-# INLINE sizeOf #-}
-  alignment _ = alignment (undefined::a)
-  {-# INLINE alignment #-}
-  poke ptr (V4 x y z w) = do poke ptr' x
-                             pokeElemOff ptr' 1 y
-                             pokeElemOff ptr' 2 z
-                             pokeElemOff ptr' 3 w
-    where ptr' = castPtr ptr
-  {-# INLINE poke #-}
-  peek ptr = V4 <$> peek ptr' <*> peekElemOff ptr' 1
-                <*> peekElemOff ptr' 2 <*> peekElemOff ptr' 3
-    where ptr' = castPtr ptr
-  {-# INLINE peek #-}
-
-instance Storable a => Storable (V2 a) where
-  sizeOf _ = 2 * sizeOf (undefined::a)
-  {-# INLINE sizeOf #-}
-  alignment _ = alignment (undefined::a)
-  {-# INLINE alignment #-}
-  poke ptr (V2 x y) = poke ptr' x >> pokeElemOff ptr' 1 y
-    where ptr' = castPtr ptr
-  {-# INLINE poke #-}
-  peek ptr = V2 <$> peek ptr' <*> peekElemOff ptr' 1
-    where ptr' = castPtr ptr
-  {-# INLINE peek #-}
-
-instance Num a => Num (V2 a) where
-    (+) = liftA2 (+)
-    (-) = liftA2 (-)
-    (*) = liftA2 (*)
-    negate = fmap negate
-    abs = fmap abs
-    signum = fmap signum
-    fromInteger = pure . fromInteger
+  ( module Vect
+  ) where
+
+#if defined(nolinear)
+import SDL.Internal.Vect as Vect
+#else
+import Linear as Vect
+import Linear.Affine as Vect
+#endif