[cig-commits] commit: Updating stgMagma.

[Mercurial]

changeset:   41:7bf48ba7b8e2
user:        LukeHodkinson
date:        Fri Mar 07 00:31:52 2008 +0000
files:       SConstruct config/SConfig/packages/X11.py config/SConfig/packages/__init__.py config/SConfig/packages/libJPEG.py config/packages/stgMagma.py
description:
Updating stgMagma.


diff -r 6ca3cf494638 -r 7bf48ba7b8e2 SConstruct
--- a/SConstruct	Fri Mar 07 00:08:53 2008 +0000
+++ b/SConstruct	Fri Mar 07 00:31:52 2008 +0000
@@ -17,7 +17,7 @@ if 'config' in COMMAND_LINE_TARGETS or '
     opts = Options() # Create our options database.
 
     # Setup all the packages we want configured.
-    env.Package(packages.stgUnderworld, opts)
+    env.Package(packages.stgMagma, opts)
 
     # Displaying help?
     if 'help' in COMMAND_LINE_TARGETS:
@@ -57,5 +57,7 @@ else:
     SConscript('PICellerator/SConscript', exports='env')
     env.Prepend(LIBS='PICellerator')
     SConscript('Underworld/SConscript', exports='env')
+    env.Prepend(LIBS='Underworld')
+    SConscript('Magma/SConscript', exports='env')
     if env['with_glucifer']:
         SConscript('gLucifer/SConscript', exports='env')
diff -r 6ca3cf494638 -r 7bf48ba7b8e2 config/SConfig/packages/X11.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/SConfig/packages/X11.py	Fri Mar 07 00:31:52 2008 +0000
@@ -0,0 +1,13 @@
+import os
+import SConfig
+
+class X11(SConfig.Package):
+    def __init__(self, env, options):
+        SConfig.Package.__init__(self, env, options)
+        self.header_sub_dir = 'X11'
+        self.headers = [['Xlib.h']]
+        self.libraries = [['X11', 'Xmu']]
+        self.have_define = 'HAVE_X11'
+        self.symbols = [(['XOpenDisplay'], '')]
+        self.symbol_setup = 'void* display;'
+        self.symbol_calls = ['display = %s(NULL);']
diff -r 6ca3cf494638 -r 7bf48ba7b8e2 config/SConfig/packages/__init__.py
--- a/config/SConfig/packages/__init__.py	Fri Mar 07 00:08:53 2008 +0000
+++ b/config/SConfig/packages/__init__.py	Fri Mar 07 00:31:52 2008 +0000
@@ -18,3 +18,4 @@ from libFAME import libFAME
 from libFAME import libFAME
 from libavcodec import libavcodec
 from HDF5 import HDF5
+from X11 import X11
diff -r 6ca3cf494638 -r 7bf48ba7b8e2 config/SConfig/packages/libJPEG.py
--- a/config/SConfig/packages/libJPEG.py	Fri Mar 07 00:08:53 2008 +0000
+++ b/config/SConfig/packages/libJPEG.py	Fri Mar 07 00:31:52 2008 +0000
@@ -4,6 +4,6 @@ class libJPEG(SConfig.Package):
 class libJPEG(SConfig.Package):
     def __init__(self, env, options):
         SConfig.Package.__init__(self, env, options)
-        self.headers = [['jpeglib']]
+        self.headers = [['jpeglib.h']]
         self.libraries = [['jpeg']]
         self.have_define = 'HAVE_JPEG'
diff -r 6ca3cf494638 -r 7bf48ba7b8e2 config/packages/stgMagma.py
--- a/config/packages/stgMagma.py	Fri Mar 07 00:08:53 2008 +0000
+++ b/config/packages/stgMagma.py	Fri Mar 07 00:31:52 2008 +0000
@@ -17,6 +17,20 @@ class stgMagma(SConfig.Package):
             self.require(SConfig.packages.OpenGL)
             mesa = self.require(SConfig.packages.OSMesa)
             mesa.required = False
+            x11 = self.require(SConfig.packages.X11)
+            x11.required = False
+            sdl = self.require(SConfig.packages.SDL)
+            sdl.required = False
+            avc = self.require(SConfig.packages.libavcodec)
+            avc.required = False
+            fame = self.require(SConfig.packages.libFAME)
+            fame.required = False
+            png = self.require(SConfig.packages.libPNG)
+            png.required = False
+            jpg = self.require(SConfig.packages.libJPEG)
+            jpg.required = False
+            tiff = self.require(SConfig.packages.libTIFF)
+            tiff.required = False
 
     def setup_options(self):
         SConfig.Package.setup_options(self)