1 files changed, 126 insertions, 103 deletions
diff --git a/Spear.cabal b/Spear.cabal
index 0be03fe..d21f594 100644
--- a/Spear.cabal
+++ b/Spear.cabal
@@ -12,116 +12,139 @@ author: Marc Sunet
 data-dir: ""
 library
-    build-depends:
+  build-depends:
-      GLFW-b -any,
+    --stb-image >= 0.3.0, TODO: Remove
-      OpenAL -any,
+    ALUT,
-      ALUT -any,
+    GLFW-b,
-      OpenGL >= 3,
+    OpenAL,
-      OpenGLRaw -any,
+    OpenGL >=3,
-      StateVar -any,
+    OpenGLRaw,
-      --stb-image >= 0.3.0, TODO: Remove
+    StateVar,
-      base -any,
+    array,
-      bytestring -any,
+    base,
-      directory -any,
+    bytestring,
-      exceptions -any,
+    containers,
-      file-embed -any,
+    directory,
-      hashable -any,
+    exceptions,
-      hashmap -any,
+    file-embed,
-      mtl -any,
+    hashable,
-      text -any,
+    hashmap,
-      transformers -any,
+    mtl,
-      resourcet -any,
+    parsec >=3,
-      parsec >= 3,
+    resourcet,
-      containers -any,
+    text,
-      vector -any,
+    transformers,
-      array -any
+    vector
-    exposed-modules:
+  exposed-modules:
-      Spear.App
+    Spear.App
-      Spear.Asset.Image
+    Spear.Asset.Image
-      Spear.Game
+    Spear.Game
-      Spear.Math.AABB
+    Spear.Math.AABB
-      Spear.Math.Algebra
+    Spear.Math.Algebra
-      Spear.Math.Camera
+    Spear.Math.Camera
-      Spear.Math.Circle
+    Spear.Math.Circle
-      Spear.Math.Frustum
+    Spear.Math.Frustum
-      Spear.Math.Matrix3
+    Spear.Math.Matrix3
-      Spear.Math.Matrix4
+    Spear.Math.Matrix4
-      Spear.Math.MatrixUtils
+    Spear.Math.MatrixUtils
-      Spear.Math.Plane
+    Spear.Math.Plane
-      Spear.Math.Quaternion
+    Spear.Math.Quaternion
-      Spear.Math.Ray
+    Spear.Math.Ray
-      Spear.Math.Segment
+    Spear.Math.Segment
-      Spear.Math.Spatial
+    Spear.Math.Spatial
-      Spear.Math.Spatial2
+    Spear.Math.Spatial2
-      Spear.Math.Spatial3
+    Spear.Math.Spatial3
-      Spear.Math.Sphere
+    Spear.Math.Sphere
-      Spear.Math.Triangle
+    Spear.Math.Triangle
-      Spear.Math.Utils
+    Spear.Math.Utils
-      Spear.Math.Vector
+    Spear.Math.Vector
-      Spear.Math.Vector.Vector
+    Spear.Math.Vector.Vector
-      Spear.Math.Vector.Vector2
+    Spear.Math.Vector.Vector2
-      Spear.Math.Vector.Vector3
+    Spear.Math.Vector.Vector3
-      Spear.Math.Vector.Vector4
+    Spear.Math.Vector.Vector4
-      Spear.Physics.Collision
+    Spear.Physics.Collision
-      Spear.Physics.RigidBody
+    Spear.Physics.RigidBody
-      Spear.Prelude
+    Spear.Prelude
-      Spear.Render.Asset
+    Spear.Render.Asset
-      Spear.Render.Core
+    Spear.Render.Core
-      Spear.Render.Core.Buffer
+    Spear.Render.Core.Buffer
-      Spear.Render.Core.Constants
+    Spear.Render.Core.Constants
-      Spear.Render.Core.Geometry
+    Spear.Render.Core.Geometry
-      Spear.Render.Core.Pipeline
+    Spear.Render.Core.Pipeline
-      Spear.Render.Core.Shader
+    Spear.Render.Core.Shader
-      Spear.Render.Core.State
+    Spear.Render.Core.State
-      Spear.Render.Core.Texture
+    Spear.Render.Core.Texture
-      Spear.Render.Immediate
+    Spear.Render.Immediate
-      Spear.Render.Shaders
+    Spear.Render.Shaders
-      Spear.Sound.Sound
+    Spear.Sound.Sound
-      Spear.Sound.State
+    Spear.Sound.State
-      Spear.Step
+    Spear.Step
-      Spear.Sys.Store
+    Spear.Sys.Store
-      Spear.Sys.Store.ID
+    Spear.Sys.Store.ID
-      Spear.Sys.Timer
+    Spear.Sys.Timer
-      Spear.Window
+    Spear.Window
-    exposed: True
+  exposed: True
+  buildable: True
+  build-tools: hsc2hs >=0
+  c-sources:
+    Spear/Sys/Timer/timer.c
+    Spear/cbits/stb/stb_image.c
-    buildable: True
+  includes:
+    Spear/Sys/Timer/timer.h
+    cbits/stb/stb_image.h
-    build-tools: hsc2hs -any
+  include-dirs:
+    .
+    Spear
+    Spear/Sys
+    Spear/cbits
-    c-sources:
+  hs-source-dirs: .
-      Spear/cbits/stb/stb_image.c
+  cc-options:
-      Spear/Sys/Timer/timer.c
+    -O2
+    -Wno-unused-result
-    includes:
+  ghc-options: -O2
-      cbits/stb/stb_image.h
+  ghc-prof-options:
-      Spear/Sys/Timer/timer.h
+    -O2
+    -g
-    include-dirs:
+    -prof
-      .
+    -fprof-auto
-      Spear
+    -fprof-cafs
-      Spear/cbits
+    -rtsopts
-      Spear/Sys
-    hs-source-dirs: .
-    cc-options:       -O2 -Wno-unused-result
-    ghc-options:      -O2
-    ghc-prof-options: -O2 -g -fprof-auto -fprof-cafs
 executable pong
-  hs-source-dirs:      Demos/Pong
+  hs-source-dirs: Demos/Pong
-  main-is:             Main.hs
+  main-is: Main.hs
-  other-modules:       Pong
+  other-modules: Pong
-  build-depends:       base, Spear
+  build-depends:
-  ghc-options:         -O2
+    Spear,
-  ghc-prof-options:    -O2 -g -fprof-auto -fprof-cafs
+    base
+  ghc-options: -O2
+  ghc-prof-options:
+    -O2
+    -g
+    -prof
+    -fprof-auto
+    -fprof-cafs
+    -rtsopts
 executable balls
-  hs-source-dirs:      Demos/Balls
+  hs-source-dirs: Demos/Balls
-  main-is:             Main.hs
+  main-is: Main.hs
-  build-depends:       base, Spear
+  build-depends:
-  ghc-options:         -O2
+    Spear,
-  ghc-prof-options:    -O2 -g -fprof-auto -fprof-cafs
+    base
+  ghc-options: -O2
+  ghc-prof-options:
+    -O2
+    -g
+    -prof
+    -fprof-auto
+    -fprof-cafs
+    -rtsopts

diff --git a/Spear.cabal b/Spear.cabal index 0be03fe..d21f594 100644 --- a/Spear.cabal +++ b/Spear.cabal
@@ -12,116 +12,139 @@ author: Marc Sunet
12	data-dir: ""	12	data-dir: ""
13		13
14	library	14	library
15	build-depends:	15	build-depends:
16	GLFW-b -any,	16	--stb-image >= 0.3.0, TODO: Remove
17	OpenAL -any,	17	ALUT,
18	ALUT -any,	18	GLFW-b,
19	OpenGL >= 3,	19	OpenAL,
20	OpenGLRaw -any,	20	OpenGL >=3,
21	StateVar -any,	21	OpenGLRaw,
22	--stb-image >= 0.3.0, TODO: Remove	22	StateVar,
23	base -any,	23	array,
24	bytestring -any,	24	base,
25	directory -any,	25	bytestring,
26	exceptions -any,	26	containers,
27	file-embed -any,	27	directory,
28	hashable -any,	28	exceptions,
29	hashmap -any,	29	file-embed,
30	mtl -any,	30	hashable,
31	text -any,	31	hashmap,
32	transformers -any,	32	mtl,
33	resourcet -any,	33	parsec >=3,
34	parsec >= 3,	34	resourcet,
35	containers -any,	35	text,
36	vector -any,	36	transformers,
37	array -any	37	vector
38		38
39	exposed-modules:	39	exposed-modules:
40	Spear.App	40	Spear.App
41	Spear.Asset.Image	41	Spear.Asset.Image
42	Spear.Game	42	Spear.Game
43	Spear.Math.AABB	43	Spear.Math.AABB
44	Spear.Math.Algebra	44	Spear.Math.Algebra
45	Spear.Math.Camera	45	Spear.Math.Camera
46	Spear.Math.Circle	46	Spear.Math.Circle
47	Spear.Math.Frustum	47	Spear.Math.Frustum
48	Spear.Math.Matrix3	48	Spear.Math.Matrix3
49	Spear.Math.Matrix4	49	Spear.Math.Matrix4
50	Spear.Math.MatrixUtils	50	Spear.Math.MatrixUtils
51	Spear.Math.Plane	51	Spear.Math.Plane
52	Spear.Math.Quaternion	52	Spear.Math.Quaternion
53	Spear.Math.Ray	53	Spear.Math.Ray
54	Spear.Math.Segment	54	Spear.Math.Segment
55	Spear.Math.Spatial	55	Spear.Math.Spatial
56	Spear.Math.Spatial2	56	Spear.Math.Spatial2
57	Spear.Math.Spatial3	57	Spear.Math.Spatial3
58	Spear.Math.Sphere	58	Spear.Math.Sphere
59	Spear.Math.Triangle	59	Spear.Math.Triangle
60	Spear.Math.Utils	60	Spear.Math.Utils
61	Spear.Math.Vector	61	Spear.Math.Vector
62	Spear.Math.Vector.Vector	62	Spear.Math.Vector.Vector
63	Spear.Math.Vector.Vector2	63	Spear.Math.Vector.Vector2
64	Spear.Math.Vector.Vector3	64	Spear.Math.Vector.Vector3
65	Spear.Math.Vector.Vector4	65	Spear.Math.Vector.Vector4
66	Spear.Physics.Collision	66	Spear.Physics.Collision
67	Spear.Physics.RigidBody	67	Spear.Physics.RigidBody
68	Spear.Prelude	68	Spear.Prelude
69	Spear.Render.Asset	69	Spear.Render.Asset
70	Spear.Render.Core	70	Spear.Render.Core
71	Spear.Render.Core.Buffer	71	Spear.Render.Core.Buffer
72	Spear.Render.Core.Constants	72	Spear.Render.Core.Constants
73	Spear.Render.Core.Geometry	73	Spear.Render.Core.Geometry
74	Spear.Render.Core.Pipeline	74	Spear.Render.Core.Pipeline
75	Spear.Render.Core.Shader	75	Spear.Render.Core.Shader
76	Spear.Render.Core.State	76	Spear.Render.Core.State
77	Spear.Render.Core.Texture	77	Spear.Render.Core.Texture
78	Spear.Render.Immediate	78	Spear.Render.Immediate
79	Spear.Render.Shaders	79	Spear.Render.Shaders
80	Spear.Sound.Sound	80	Spear.Sound.Sound
81	Spear.Sound.State	81	Spear.Sound.State
82	Spear.Step	82	Spear.Step
83	Spear.Sys.Store	83	Spear.Sys.Store
84	Spear.Sys.Store.ID	84	Spear.Sys.Store.ID
85	Spear.Sys.Timer	85	Spear.Sys.Timer
86	Spear.Window	86	Spear.Window
87		87
88	exposed: True	88	exposed: True
		89	buildable: True
		90	build-tools: hsc2hs >=0
		91	c-sources:
		92	Spear/Sys/Timer/timer.c
		93	Spear/cbits/stb/stb_image.c
89		94
90	buildable: True	95	includes:
		96	Spear/Sys/Timer/timer.h
		97	cbits/stb/stb_image.h
91		98
92	build-tools: hsc2hs -any	99	include-dirs:
		100	.
		101	Spear
		102	Spear/Sys
		103	Spear/cbits
93		104
94	c-sources:	105	hs-source-dirs: .
95	Spear/cbits/stb/stb_image.c	106	cc-options:
96	Spear/Sys/Timer/timer.c	107	-O2
		108	-Wno-unused-result
97		109
98	includes:	110	ghc-options: -O2
99	cbits/stb/stb_image.h	111	ghc-prof-options:
100	Spear/Sys/Timer/timer.h	112	-O2
101		113	-g
102	include-dirs:	114	-prof
103	.	115	-fprof-auto
104	Spear	116	-fprof-cafs
105	Spear/cbits	117	-rtsopts
106	Spear/Sys
107
108	hs-source-dirs: .
109
110	cc-options: -O2 -Wno-unused-result
111	ghc-options: -O2
112	ghc-prof-options: -O2 -g -fprof-auto -fprof-cafs
113		118
114	executable pong	119	executable pong
115	hs-source-dirs: Demos/Pong	120	hs-source-dirs: Demos/Pong
116	main-is: Main.hs	121	main-is: Main.hs
117	other-modules: Pong	122	other-modules: Pong
118	build-depends: base, Spear	123	build-depends:
119	ghc-options: -O2	124	Spear,
120	ghc-prof-options: -O2 -g -fprof-auto -fprof-cafs	125	base
		126
		127	ghc-options: -O2
		128	ghc-prof-options:
		129	-O2
		130	-g
		131	-prof
		132	-fprof-auto
		133	-fprof-cafs
		134	-rtsopts
121		135
122	executable balls	136	executable balls
123	hs-source-dirs: Demos/Balls	137	hs-source-dirs: Demos/Balls
124	main-is: Main.hs	138	main-is: Main.hs
125	build-depends: base, Spear	139	build-depends:
126	ghc-options: -O2	140	Spear,
127	ghc-prof-options: -O2 -g -fprof-auto -fprof-cafs	141	base
		142
		143	ghc-options: -O2
		144	ghc-prof-options:
		145	-O2
		146	-g
		147	-prof
		148	-fprof-auto
		149	-fprof-cafs
		150	-rtsopts