Changeset 4

Timestamp:

12/13/2006 11:00:45 PM (5 years ago)

Author:

art

Message:

 

Files:

• Bindings/glfw/SConstruct (modified) (2 diffs)
• Plugins/luaScripting/SConstruct (modified) (2 diffs)
• SConstruct (modified) (4 diffs)
• nrEngine/SConstruct (modified) (2 diffs)

Bindings/glfw/SConstruct

@@ -2 +2 @@
 Import('build')
 
+env = build.Copy()
+
 # define include directory
-include = "../../"
-build.Append(INCDIR = include, CPPPATH=[include])
+include = ['../../', env['prefix'] + '/include/']
+env.Append(CPPPATH=include)
 
 # file list of files to be build
@@ -21 +23 @@
 
 # Specify the library path where to search and the libraries to which to link
-libpaths = ['.', build['prefix'] + '/lib', '/usr/local/lib', '/usr/lib', './lib']
+libpaths = ['.', env['prefix'] + '/lib', '/usr/local/lib', '/usr/lib', './lib']
 libs = ['glfw']
 
 # if we have to build shared version
-if build['Shared']:
-        library = build.SharedLibrary ('nrEngine_GLFWBinding', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Shared']:
+        library = env.SharedLibrary ('nrEngine_GLFWBinding', fileList, LIBS=libs, LIBPATH=libpaths)
 
 # if we have to built static version
-if build['Static']:
-        library = build.StaticLibrary ('nrEngine_GLFWBinding', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Static']:
+        library = env.StaticLibrary ('nrEngine_GLFWBinding', fileList, LIBS=libs, LIBPATH=libpaths)
 
 # compute the directory names where to store the include files
-incdir = build['incdir'] + '/nrEngine/Binding/glfw'
+incdir = env['incdir'] + '/nrEngine/Binding/glfw'
 
 # Now check for installing feature
-build.Install(build['libdir'], library)
-build.Install(incdir, fileListInc)
-il = build.Alias('install-lib', build['libdir'])
-ih = build.Alias('install-inc', [incdir])
-build.Alias('install', [il, ih])
+env.Install(env['libdir'], library)
+env.Install(incdir, fileListInc)
+il = env.Alias('install-lib', env['libdir'])
+ih = env.Alias('install-inc', [incdir])
+env.Alias('install', [il, ih])
 

Plugins/luaScripting/SConstruct

@@ -1 +1 @@
 # Import the current building environment
+import os
 Import('build')
 
+# no copy the build into own environment
+env = build.Copy()
+
 # define include directory
-include = "include"
-build.Append(INCDIR = include, CPPPATH=[include])
+include = ["include", env['prefix'] + '/include/']
+env.Append(CPPPATH=include, LINKFLAGS='-v -WL,-E,-Bstatic -nodefaultlibs')
 
 # file list of files to be build
@@ -16 +20 @@
 
 # Specify the library path where to search and the libraries to which to link
-libpaths = ['.', build['prefix'] + '/lib', '/usr/local/lib', '/usr/lib']
-libs = ['lua']
+libpaths = ['.', env['prefix'] + '/lib', '/usr/local/lib', '/usr/lib']
+libs = ['lua', 'stdc++', 'c', 'm', 'gcc']
 
 suffix = ''
 
 # if we have to build shared version
-if build['Shared']:
-        library = build.SharedLibrary ('luaScripting.so', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Shared']:
+        library = env.SharedLibrary ('luaScripting', fileList, LIBS=libs, LIBPATH=libpaths)
         suffix = '.so'
 
 # if we have to built static version
-if build['Static']:
-        library = build.StaticLibrary ('luaScripting', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Static']:
+        library = env.StaticLibrary ('luaScripting', fileList, LIBS=libs, LIBPATH=libpaths)
         suffix = '.a'
 
-# Now check for installing feature
-instLocation = build['libdir'] + '/nrEngine/' + 'luaScripting' + suffix
+# Create install location
+instLocation = env['libdir'] + '/nrEngine/' + 'luaScripting' + suffix
 
-build.InstallAs(instLocation, library)
-il = build.Alias('install-lib', instLocation)
+# Create new alias for installing into this location
+il = build.Alias('install-lib', build.InstallAs(instLocation, library))
 build.Alias('install', [il])
 

SConstruct

@@ -27 +27 @@
 # We define the default build environment
 # --------------------------------------------------
-env = Environment(CC = COMPILER, CCFLAGS = CPPFLAGS,
-                                                                        PROGPREFIX=BIN_DIR, OBJPREFIX=OBJ_DIR)
-
-# Check for libraries and header files
-conf = Configure(env)
+env = Environment(CC = COMPILER, CCFLAGS = CPPFLAGS, PROGPREFIX=BIN_DIR, OBJPREFIX=OBJ_DIR)
 
 # --------------------------------------------------
 # Check for default Libraries and headers
 # --------------------------------------------------
+# Check for libraries and header files
+conf = Configure(env)
+
 # Check for vector and map header to find STL library
 if not conf.CheckCXXHeader('vector') or not conf.CheckCXXHeader('map'):
@@ -56 +55 @@
 
 # Check for Boost-Thread headers
-if not conf.CheckCXXHeader('boost/thread/thread.hpp'):
-        print 'Boost-Thread must be installed!'
-        Exit(1)
+#if not conf.CheckCXXHeader('boost/thread/thread.hpp'):
+#       print 'Boost-Thread must be installed!'
+#       Exit(1)
 
 # Check for dl-library
@@ -67 +66 @@
 
 env = conf.Finish()
-
-
 
 # --------------------------------------------------
@@ -139 +136 @@
 build.Append(options = opts)
 
+
+
 # Include building files from subdirectories
 BuildDir('nrEngine/build', 'nrEngine/src', duplicate=0)
 
-build.SConscript('nrEngine/SConstruct','build')
-build.SConscript('Bindings/glfw/SConstruct','build')
-build.SConscript('Plugins/luaScripting/SConstruct', 'build')
 
+SConscript('nrEngine/SConstruct', 'build')
+#SConscript('Bindings/glfw/SConstruct', 'build')
+
+#if 'luaScriptin' in COMMAND_LINE_TARGETS:
+SConscript('Plugins/luaScripting/SConstruct', 'build')
+

nrEngine/SConstruct

@@ -2 +2 @@
 Import('build')
 
+env = build.Copy()
+
 # define include directory
-include = "include"
-build.Append(INCDIR = include, CPPPATH=[include])
+include = ['include', env['prefix'] + '/include/']
+env.Append(CPPPATH = include, CCFLAGS=' -pthread ')
 
 # file list of files to be build
@@ -106 +108 @@
 
 # Specify the library path where to search and the libraries to which to link
-libpaths = ['.', '/usr/local/lib', '/usr/lib']
+libpaths = ['.', env['prefix'] + '/lib/', '/usr/local/lib', '/usr/lib']
 libs = ['dl', 'boost_thread']
 
 # if we have to build shared version
-if build['Shared']:
-        library = build.SharedLibrary ('nrEngine', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Shared']:
+        library = env.SharedLibrary ('nrEngine', fileList, LIBS=libs, LIBPATH=libpaths)
 
 # if we have to built static version
-if build['Static']:
-        library = build.StaticLibrary ('nrEngine', fileList, LIBS=libs, LIBPATH=libpaths)
+if env['Static']:
+        library = env.StaticLibrary ('nrEngine', fileList, LIBS=libs, LIBPATH=libpaths)
 
 # compute the directory names where to store the include files
-incdir = build['incdir'] + '/nrEngine/'
-incdirev = build['incdir'] + '/nrEngine/events/'
+incdir = env['incdir'] + '/nrEngine/'
+incdirev = env['incdir'] + '/nrEngine/events/'
 
 # Now check for installing feature
-build.Install(build['libdir'], library)
+build.Install(env['libdir'], library)
 build.Install(incdir, fileListInc)
 build.Install(incdirev, fileListIncEvents)
-il = build.Alias('install-lib', build['libdir'])
+il = build.Alias('install-lib', env['libdir'])
 ih = build.Alias('install-inc', [incdir, incdirev])
 build.Alias('install', [il, ih])