reorganize modules and add new dependencies

This commit is contained in:
nek0 2020-12-06 08:15:31 +01:00
parent b3e1d204c5
commit 5675cf7f6d
2 changed files with 17 additions and 12 deletions

View File

@ -25,6 +25,8 @@ executable pituicat
, Types.Graphics , Types.Graphics
, Types.Graphics.VertexArray , Types.Graphics.VertexArray
, Types.Graphics.VertexBuffer , Types.Graphics.VertexBuffer
, Types.Graphics.IndexBuffer
, Types.Graphics.Shader
, Types.Util , Types.Util
, Classes , Classes
, Classes.Scene , Classes.Scene
@ -32,18 +34,19 @@ executable pituicat
, Classes.Graphics.Bindable , Classes.Graphics.Bindable
, Classes.Graphics.Buffer , Classes.Graphics.Buffer
, Classes.Graphics.VertexLayout , Classes.Graphics.VertexLayout
, State.Loading -- , State.Loading
, State.Loading.Load -- , State.Loading.Load
, State.Loading.Update -- , State.Loading.Update
, State.Loading.Draw -- , State.Loading.Draw
, State.MainGame -- , State.MainGame
, State.MainGame.Load -- , State.MainGame.Load
, State.MainGame.Update -- , State.MainGame.Update
, State.MainGame.Draw -- , State.MainGame.Draw
, Scenes.Test , Scenes.Test
, Map , Map
, StateMachine , StateMachine
, Texture , Texture
, Renderer
-- other-extensions: -- other-extensions:
build-depends: base >=4.13.0.0 build-depends: base >=4.13.0.0
, affection , affection
@ -61,5 +64,7 @@ executable pituicat
, bytestring , bytestring
, derive-storable , derive-storable
, monad-loops , monad-loops
, StateVar
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall -threaded

View File

@ -27,16 +27,16 @@ let
f = { mkDerivation, aeson, base, bytestring, containers, derive-storable f = { mkDerivation, aeson, base, bytestring, containers, derive-storable
, JuicyPixels, JuicyPixels-extra, linear, monad-loops, OpenGL, OpenGLRaw , JuicyPixels, JuicyPixels-extra, linear, monad-loops, OpenGL, OpenGLRaw
, stdenv, sdl2, stm, text, vector}: , stdenv, sdl2, StateVar, stm, text, vector}:
mkDerivation { mkDerivation {
pname = "pituicat"; pname = "pituicat";
version = "0.0.0.0"; version = "0.0.0.0";
src = ./.; src = ./.;
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
executableHaskellDepends = [ aeson affection base bytestring linear executableHaskellDepends = [ aeson affection base bytestring containers
containers JuicyPixels JuicyPixels-extra OpenGL OpenGLRaw sdl2 stm text derive-storable JuicyPixels JuicyPixels-extra linear monad-loops OpenGL
vector]; OpenGLRaw sdl2 StateVar stm text vector];
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
}; };