update cabal files

lambdacube3d · Jun 22, 2018 · 50cd099 · 50cd099
1 parent 02b1cb8
commit 50cd099
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 25 deletions.
diff --git a/lambdacube-core/lambdacube-core.cabal b/lambdacube-core/lambdacube-core.cabal
@@ -16,11 +16,11 @@ Synopsis:       LambdaCube 3D IR
 Library
   Build-Depends:
         base >=4.7 && <5,
-        containers >=0.5 && <0.6,
-        mtl >=2.2 && <2.3,
-        bytestring >=0.10 && <0.11,
-        bytestring-trie >=0.2 && <0.3,
-        vector >=0.10 && <0.11
+        containers >=0.5,
+        mtl >=2.2,
+        bytestring >=0.10,
+        bytestring-trie >=0.2,
+        vector >=0.10
 
   default-language:  Haskell2010
   hs-source-dirs:    src/lib

diff --git a/lambdacube-edsl/lambdacube-edsl.cabal b/lambdacube-edsl/lambdacube-edsl.cabal
@@ -16,11 +16,11 @@ Synopsis:       LambdaCube 3D EDSL definition
 Library
   Build-Depends:
         base >=4.7 && <5,
-        containers >=0.5 && <0.6,
-        mtl >=2.2 && <2.3,
-        bytestring >=0.10 && <0.11,
-        bytestring-trie >=0.2 && <0.3,
-        vector >=0.10 && <0.11,
+        containers >=0.5,
+        mtl >=2.2,
+        bytestring >=0.10,
+        bytestring-trie >=0.2,
+        vector >=0.10,
         ghc-prim,
         --data-reify >= 0.6 && <0.7,
         lambdacube-core == 0.2.0

diff --git a/lambdacube-gl/lambdacube-gl.cabal b/lambdacube-gl/lambdacube-gl.cabal
@@ -31,17 +31,17 @@ Library
   hs-source-dirs:    src/lib
   Build-Depends: 
         base >=4.7 && <5,
-        binary >=0.7 && <0.8,
-        bytestring >=0.10 && <0.11,
-        containers >=0.5 && <0.6,
-        mtl >=2.2 && <2.3,
-        vector >=0.10 && <0.11,
-        prettyclass >=1.0 && <1.1,
+        binary >=0.7,
+        bytestring >=0.10,
+        containers >=0.5,
+        mtl >=2.2,
+        vector >=0.10,
+        prettyclass >=1.0,
 
-        bytestring-trie >=0.2 && <0.3,
-        OpenGLRaw >=1.5 && <1.6,
-        bitmap >= 0.0.2 && <0.0.3,
-        language-glsl >=0.2 && <0.3,
+        bytestring-trie >=0.2,
+        OpenGLRaw >=1.5,
+        bitmap >= 0.0.2,
+        language-glsl >=0.2,
 
         lambdacube-core == 0.2.0,
         lambdacube-edsl == 0.2.0

diff --git a/lambdacube-samples/lambdacube-samples.cabal b/lambdacube-samples/lambdacube-samples.cabal
@@ -46,36 +46,101 @@ executable lambdacube-hello
   main-is:             Hello.hs
   -- other-modules:
   other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
-  build-depends:       base >=4.7 && <5, mtl >=2.2 && <2.3, bytestring >=0.10 && <0.11, bytestring-trie >=0.2 && <0.3, vect >=0.4 && <0.5, vector >=0.10 && <0.11, elerea >=2.7 && <2.8, lambdacube-core >=0.2 && <0.3, lambdacube-edsl >=0.2 && <0.3, lambdacube-gl >=0.2 && <0.3, time >=1.4 && <1.5, OpenGLRaw >=1.4 && <1.6, GLFW-b ==1.4.6, stb-image ==0.2.1
   default-language:    Haskell2010
+  build-depends:       base >=4.7 && <5,
+                       mtl >=2.2,
+                       bytestring >=0.10,
+                       bytestring-trie >=0.2,
+                       vect >=0.4,
+                       vector >=0.10,
+                       elerea >=2.7,
+                       lambdacube-core >=0.2,
+                       lambdacube-edsl >=0.2,
+                       lambdacube-gl >=0.2,
+                       time >=1.4,
+                       OpenGLRaw >=1.4,
+                       GLFW-b >=1.4.6,
+                       stb-image
 
 executable lambdacube-shadowmapping
   main-is:             ShadowMapping.hs
   -- other-modules:
   other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
-  build-depends:       base >=4.7 && <5, mtl >=2.2 && <2.3, bytestring >=0.10 && <0.11, bytestring-trie >=0.2 && <0.3, vect >=0.4 && <0.5, vector >=0.10 && <0.11, elerea >=2.7 && <2.8, lambdacube-core >=0.2 && <0.3, lambdacube-edsl >=0.2 && <0.3, lambdacube-gl >=0.2 && <0.3, time >=1.4 && <1.5, OpenGLRaw >=1.4 && <1.6, GLFW-b ==1.4.6
   default-language:    Haskell2010
+  build-depends:       base >=4.7 && <5,
+                       mtl >=2.2,
+                       bytestring >=0.10,
+                       bytestring-trie >=0.2,
+                       vect >=0.4,
+                       vector >=0.10,
+                       elerea >=2.7,
+                       lambdacube-core >=0.2,
+                       lambdacube-edsl >=0.2,
+                       lambdacube-gl >=0.2,
+                       time >=1.4,
+                       OpenGLRaw >=1.4,
+                       GLFW-b >=1.4.6,
+                       stb-image
 
 executable lambdacube-cubemap
   main-is:             CubeMap.hs
   -- other-modules:
   other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
-  build-depends:       base >=4.7 && <5, mtl >=2.2 && <2.3, bytestring >=0.10 && <0.11, bytestring-trie >=0.2 && <0.3, vect >=0.4 && <0.5, vector >=0.10 && <0.11, elerea >=2.7 && <2.8, lambdacube-core >=0.2 && <0.3, lambdacube-edsl >=0.2 && <0.3, lambdacube-gl >=0.2 && <0.3, time >=1.4 && <1.5, OpenGLRaw >=1.4 && <1.6, GLFW-b ==1.4.6
   default-language:    Haskell2010
+  build-depends:       base >=4.7 && <5,
+                       mtl >=2.2,
+                       bytestring >=0.10,
+                       bytestring-trie >=0.2,
+                       vect >=0.4,
+                       vector >=0.10,
+                       elerea >=2.7,
+                       lambdacube-core >=0.2,
+                       lambdacube-edsl >=0.2,
+                       lambdacube-gl >=0.2,
+                       time >=1.4,
+                       OpenGLRaw >=1.4,
+                       GLFW-b >=1.4.6,
+                       stb-image
 
 executable lambdacube-convolutionfilter
   main-is:             ConvolutionFilter.hs
   -- other-modules:
   other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
-  build-depends:       base >=4.7 && <5, mtl >=2.2 && <2.3, bytestring >=0.10 && <0.11, bytestring-trie >=0.2 && <0.3, vect >=0.4 && <0.5, vector >=0.10 && <0.11, elerea >=2.7 && <2.8, lambdacube-core >=0.2 && <0.3, lambdacube-edsl >=0.2 && <0.3, lambdacube-gl >=0.2 && <0.3, time >=1.4 && <1.5, OpenGLRaw >=1.4 && <1.6, GLFW-b ==1.4.6
   default-language:    Haskell2010
+  build-depends:       base >=4.7 && <5,
+                       mtl >=2.2,
+                       bytestring >=0.10,
+                       bytestring-trie >=0.2,
+                       vect >=0.4,
+                       vector >=0.10,
+                       elerea >=2.7,
+                       lambdacube-core >=0.2,
+                       lambdacube-edsl >=0.2,
+                       lambdacube-gl >=0.2,
+                       time >=1.4,
+                       OpenGLRaw >=1.4,
+                       GLFW-b >=1.4.6,
+                       stb-image
 
 executable lambdacube-bulletexample
   main-is:             BulletExample.hs
   -- other-modules:
   other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
   if flag(BulletInstalled)
-    build-depends:       base >=4.7 && <5, mtl >=2.2 && <2.3, bytestring >=0.10 && <0.11, bytestring-trie >=0.2 && <0.3, vect >=0.4 && <0.5, vector >=0.10 && <0.11, elerea >=2.7 && <2.8, bullet >=0.2 && <0.3, lambdacube-core >=0.2 && <0.3, lambdacube-edsl >=0.2 && <0.3, lambdacube-gl >=0.2 && <0.3, time >=1.4 && <1.5, OpenGLRaw >=1.4 && <1.6, GLFW-b ==1.4.6
+    build-depends:       base >=4.7 && <5,
+                         mtl >=2.2,
+                         bytestring >=0.10,
+                         bytestring-trie >=0.2,
+                         vect >=0.4,
+                         vector >=0.10,
+                         elerea >=2.7,
+                         bullet >=0.2,
+                         lambdacube-core >=0.2,
+                         lambdacube-edsl >=0.2,
+                         lambdacube-gl >=0.2,
+                         time >=1.4,
+                         OpenGLRaw >=1.4,
+                         GLFW-b >=1.4.6
   else
     buildable: False
   default-language:    Haskell2010
diff --git a/samples/samples.cabal b/samples/samples.cabal
@@ -0,0 +1,36 @@
+name:                samples
+version:             0.2.0
+synopsis:            Samples for LambdaCube 3D
+description:
+
+homepage:            http://lambdacube3d.wordpress.com/
+license:             BSD3
+license-file:        LICENSE
+author:              Csaba Hruska, Gergely Patai
+maintainer:          csaba.hruska@gmail.com, patai.gergely@gmail.com
+-- copyright:
+category:            Graphics
+build-type:          Simple
+cabal-version:       >=1.10
+
+
+
+executable lambdacube-deffered
+  main-is:             deferredTest.hs
+  -- other-modules:
+  other-extensions:    OverloadedStrings, TypeOperators, NoMonomorphismRestriction, ExistentialQuantification, PackageImports, DoRec, ParallelListComp, DataKinds, NamedFieldPuns
+  default-language:    Haskell2010
+  build-depends:       base >=4.7 && <5,
+                       mtl >=2.2,
+                       bytestring >=0.10,
+                       bytestring-trie >=0.2,
+                       vect >=0.4,
+                       vector >=0.10,
+                       elerea >=2.7,
+                       lambdacube-core >=0.2,
+                       lambdacube-edsl >=0.2,
+                       lambdacube-gl >=0.2,
+                       time >=1.4,
+                       OpenGLRaw >=1.4,
+                       GLFW-b >=1.4.6,
+                       stb-image