From 5675cf7f6da0e9f197eb1e3b9078c1a53d12b5c1 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 6 Dec 2020 08:15:31 +0100 Subject: [PATCH] reorganize modules and add new dependencies --- pituicat.cabal | 21 +++++++++++++-------- shell.nix | 8 ++++---- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pituicat.cabal b/pituicat.cabal index 2d6bc4b..48d08a5 100644 --- a/pituicat.cabal +++ b/pituicat.cabal @@ -25,6 +25,8 @@ executable pituicat , Types.Graphics , Types.Graphics.VertexArray , Types.Graphics.VertexBuffer + , Types.Graphics.IndexBuffer + , Types.Graphics.Shader , Types.Util , Classes , Classes.Scene @@ -32,18 +34,19 @@ executable pituicat , Classes.Graphics.Bindable , Classes.Graphics.Buffer , Classes.Graphics.VertexLayout - , State.Loading - , State.Loading.Load - , State.Loading.Update - , State.Loading.Draw - , State.MainGame - , State.MainGame.Load - , State.MainGame.Update - , State.MainGame.Draw + -- , State.Loading + -- , State.Loading.Load + -- , State.Loading.Update + -- , State.Loading.Draw + -- , State.MainGame + -- , State.MainGame.Load + -- , State.MainGame.Update + -- , State.MainGame.Draw , Scenes.Test , Map , StateMachine , Texture + , Renderer -- other-extensions: build-depends: base >=4.13.0.0 , affection @@ -61,5 +64,7 @@ executable pituicat , bytestring , derive-storable , monad-loops + , StateVar hs-source-dirs: src default-language: Haskell2010 + ghc-options: -Wall -threaded diff --git a/shell.nix b/shell.nix index 0277c4c..3a48aac 100644 --- a/shell.nix +++ b/shell.nix @@ -27,16 +27,16 @@ let f = { mkDerivation, aeson, base, bytestring, containers, derive-storable , JuicyPixels, JuicyPixels-extra, linear, monad-loops, OpenGL, OpenGLRaw - , stdenv, sdl2, stm, text, vector}: + , stdenv, sdl2, StateVar, stm, text, vector}: mkDerivation { pname = "pituicat"; version = "0.0.0.0"; src = ./.; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ aeson affection base bytestring linear - containers JuicyPixels JuicyPixels-extra OpenGL OpenGLRaw sdl2 stm text - vector]; + executableHaskellDepends = [ aeson affection base bytestring containers + derive-storable JuicyPixels JuicyPixels-extra linear monad-loops OpenGL + OpenGLRaw sdl2 StateVar stm text vector]; license = stdenv.lib.licenses.gpl3; };