...
 
Commits (7)
CONFIG_LIB_OPTS=--ghc-option=-Wall
CONFIG_BIN_OPTS=--prefix=./roguestar-local --ghc-option=-Wall
CONFIG_BIN_OPTS=--prefix=${PWD}/roguestar-local --ghc-option=-Wall
warning:
@echo "See README."
......@@ -48,7 +48,7 @@ build-bins:
(cd roguestar-gl && cabal build ${OPTS})
copy-libs:
(cd rsagl && cabal copy ${OPTS})
(cd rsagl && cabal copy ${OPTS} && cabal register ${OPTS})
copy-bins:
(cd rsagl-demos && cabal copy ${OPTS})
......
name: roguestar-engine
version: 0.4.0.1
version: 0.4.0.3
license: OtherLicense
license-file: LICENSE
author: Christopher Lane Hinson
......
......@@ -9,9 +9,13 @@ import HierarchicalDatabase
import TerrainData
import Protocol
import GridRayCaster
import Data.Version
import Paths_roguestar_engine
import Data.List (intersperse)
roguestar_version_number :: String
roguestar_version_number = "0.3"
roguestar_version_number = concat $
intersperse "." $ map show $ versionBranch version
roguestar_program_name :: String
roguestar_program_name = "roguestar-engine"
......
name: roguestar-gl
version: 0.4.0.1
version: 0.4.0.3
license: OtherLicense
license-file: LICENSE
author: Christopher Lane Hinson <lane@downstairspeople.org>
......@@ -15,7 +15,7 @@ description: Roguestar is a science fiction themed roguelike (turn-based
homepage: http://roguestar.downstairspeople.org/
build-depends: base>=4&&<5,
rsagl==0.4.0.1,
rsagl==0.4.0.3,
containers>=0.3.0.0 && < 0.4,
arrows>=0.4.1.2 && < 0.5,
mtl>=1.1.0.2 && < 1.2,
......@@ -24,8 +24,8 @@ build-depends: base>=4&&<5,
filepath>=1.1.0.3 && < 1.2,
random>=1.0.0.2 && < 1.1,
bytestring>=0.9.1.5 && < 0.10,
statistics>=0.5.1.0 && < 0.6,
vector>=0.6.0.1 && < 0.7,
vector>=0.7.0.1 && < 0.8,
statistics>=0.8.0.4 && < 0.9,
stm>=2.1.1.2 && < 2.2,
priority-sync>=0.2.1.0 && < 0.2.2
......@@ -33,7 +33,7 @@ build-type: Simple
tested-with: GHC==6.12.1
executable: roguestar-gl
main-is: Main.hs
main-is: MainGLUT.hs
hs-source-dirs: src
other-modules: Quality, ProtocolTypes, VisibleObject,
Strings, WordGenerator, Driver,
......@@ -49,8 +49,7 @@ other-modules: Quality, ProtocolTypes, VisibleObject,
Models.EnergySwords, Models.EnergyThings, Models.CyborgType4,
AnimationEvents, AnimationMenus, AnimationTerrain, AnimationTools,
AnimationExtras, AnimationCreatures, AnimationBuildings, MaybeArrow,
EventUtils, Sky
EventUtils, Sky, Config
ghc-options: -threaded -fno-warn-type-defaults -fexcess-precision
ghc-prof-options: -prof -auto-all
......
module Config
(short_version_string,
version_string,
window_name)
where
import Paths_roguestar_gl
import Data.List
import Data.Version
short_version_string :: String
short_version_string =
(concat $ intersperse "." $ map show $ versionBranch version)
version_string :: String
version_string = short_version_string ++ if null (versionTags version)
then "" else "[" ++ unwords tags_str ++ "]"
where tags_str = intersperse ", " $ map show $ versionTags version
window_name :: String
window_name = "Roguestar-GL " ++ version_string
......@@ -24,9 +24,7 @@ import Globals
import Control.Concurrent.STM
import Control.Concurrent
import Statistics
roguestar_client_version :: String
roguestar_client_version = "0.3"
import Config
default_window_size :: Size
default_window_size = Size 800 600
......@@ -52,7 +50,7 @@ main =
lib <- newLibrary
initialWindowSize $= default_window_size
initialDisplayMode $= display_mode
window <- createWindow $ "RogueStar GL " ++ roguestar_client_version
window <- createWindow window_name
reshapeCallback $= Just roguestarReshapeCallback
display_statistics <- newStatistics "rendering"
displayCallback $= roguestarDisplayCallback display_statistics scene_var print_text_object
......
name: rsagl-demos
version: 0.4.0.1
version: 0.4.0.3
license: BSD3
license-file: LICENSE
author: Christopher Lane Hinson
......@@ -17,10 +17,10 @@ tested-with: GHC==6.12.1
Executable _rsagl_modelview
main-is: ModelView.hs
ghc-options: -threaded -fno-warn-type-defaults -fexcess-precision
build-depends: base>=4, old-time, random, array, arrows, containers, parallel, mtl, OpenGL, GLUT, rsagl==0.4.0.1
build-depends: base>=4, old-time, random, array, arrows, containers, parallel, mtl, OpenGL, GLUT, rsagl==0.4.0.3
Executable _rsagl_tests
main-is: Tests.hs
ghc-options: -threaded -fno-warn-type-defaults -fexcess-precision
build-depends: base>=4&&<5, old-time, random, arrows, containers, parallel, QuickCheck, rsagl==0.4.0.1
build-depends: base>=4&&<5, old-time, random, arrows, containers, parallel, QuickCheck, rsagl==0.4.0.3
name: rsagl
version: 0.4.0.1
version: 0.4.0.3
license: BSD3
license-file: LICENSE
author: Christopher Lane Hinson
......