Permalink
Browse files

Add priority sync and split Makefile to separate active (subject to r…

…equent modification) and inactive dependencies.
  • Loading branch information...
1 parent 4840fe6 commit 4406882143bdc58124009c26766b250da4a52504 @clanehin committed May 3, 2009
Showing with 15 additions and 5 deletions.
  1. +3 −0 .gitmodules
  2. +8 −2 Makefile
  3. +1 −0 priority-sync
  4. +1 −1 roguestar-engine
  5. +1 −1 roguestar-gl
  6. +1 −1 roguestar-html
View
@@ -13,3 +13,6 @@
[submodule "rsagl-demos"]
path = rsagl-demos
url = http://www.downstairspeople.org/git/rsagl-demos.git
+[submodule "priority-sync"]
+ path = priority-sync
+ url = http://www.downstairspeople.org/git/priority-sync.git
View
@@ -12,7 +12,7 @@ GIT_ORIGIN_SUFFIX=.git
make : roguestar-gl roguestar-engine rsagl-doc rsagl-demos
-setup :
+depends-setup :
-rm -rf roguestar-local
mkdir roguestar-local
echo "[]" > roguestar-local/cabal-package-db
@@ -21,8 +21,13 @@ setup :
cabal install parsec ${CONFIGURE_OPTS} --preference='parsec >= 3'
cabal install QuickCheck ${CONFIGURE_OPTS} --preference='QuickCheck < 2'
cabal install Arrows ${CONFIGURE_OPTS}
- cabal install GLUT ${CONFIGURE_OPTS}
cabal install OpenGL ${CONFIGURE_OPTS}
+ cabal install GLUT ${CONFIGURE_OPTS}
+ cabal install heap ${CONFIGURE_OPTS}
+ cabal install stm ${CONFIGURE_OPTS}
+
+setup :
+ (cd priority-sync && runghc Setup.hs clean && runghc Setup.hs configure ${CONFIGURE_OPTS} ${CONFIGURE_ROGUESTAR_OPTS})
(cd roguestar-engine && runghc Setup.hs clean && runghc Setup.hs configure ${CONFIGURE_OPTS} ${CONFIGURE_ROGUESTAR_OPTS})
(cd rsagl && runghc Setup.hs clean && runghc Setup.hs configure ${CONFIGURE_OPTS} ${CONFIGURE_ROGUESTAR_OPTS})
(cd rsagl && runghc Setup.hs build && runghc Setup.hs install)
@@ -45,6 +50,7 @@ rsagl-doc :
(cd rsagl && runghc Setup.hs haddock --internal)
from-scratch :
+ ${MAKE} depends-setup
${MAKE} setup
${MAKE}
Submodule priority-sync added at 9dde6a
Submodule roguestar-engine updated from 4c616f to eba1a4
Submodule roguestar-gl updated from b50839 to 9a7a28
Submodule roguestar-html updated from 3cf9e5 to 969231

0 comments on commit 4406882

Please sign in to comment.