Skip to content

Commit

Permalink
Merge pull request #15 from polar-engine/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ori-sky authored Aug 17, 2016
2 parents fc129fa + 392280d commit 087c35c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 0 additions & 1 deletion polar-engine.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ library
build-depends: base >=4.8 && <5.0, containers >=0.5.5, transformers >=0.4, mtl >=2.2, bytestring >=0.10, lens >=4.12,
hint >=0.4, unordered-containers >=0.2, vector >=0.11, hashable >=1.2, stm >=2.4,
OpenGL >=2.12, OpenGLRaw >2.1, GLFW-b >=1.4.7,
tight-apply >=0.1 && <0.2, truthful >=0.1 && <0.2,
polar-shader >=0.1 && <0.2, polar-configfile >=0.5
default-language: Haskell2010
hs-source-dirs: src
Expand Down
2 changes: 1 addition & 1 deletion src/Polar/System/Renderer/OpenGL_3_2.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Data.Foldable (traverse_)
import Data.Hashable (Hashable)
import qualified Data.ByteString.Char8 as BS
import qualified Data.Map as M
import Control.Monad.RWS (MonadIO, void, when, liftIO, tell)
import Control.Monad.RWS (MonadIO, void, liftIO, tell)
import Control.Concurrent.STM (atomically)
import Control.Concurrent.STM.TChan
import Foreign (nullPtr, sizeOf, withArray)
Expand Down
7 changes: 7 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
flags: {}
packages:
- '.'
extra-deps:
- polar-configfile-0.5.0.0
- polar-shader-0.1.0.4
resolver: lts-6.12

0 comments on commit 087c35c

Please sign in to comment.