logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

vdrift-2014.10.20-sconstruct.patch (2866B)

    

  1. --- ./SConstruct.orig	2014-08-04 08:43:04.000000000 -0400

  2. +++ ./SConstruct	2017-10-15 11:18:01.792656230 -0400

  3. @@ -92,9 +92,9 @@ elif sys.platform == 'darwin':

  4.  

  5.      for a in env['universal']:

  6.          if not sdk_path:

  7. -            print 'Building a universal binary require access to an ' + \

  8. +            print ('Building a universal binary require access to an ' + \

  9.                  'SDK that has universal \nbinary support.If you know ' + \

  10. -                'the location of such an SDK, specify it using the \n"SDK" option'

  11. +                'the location of such an SDK, specify it using the \n"SDK" option')

  12.              Exit(1)

  13.          env.Append( CCFLAGS = ['-arch', a],  LINKFLAGS = ['-arch', a] )

  14.  

  15. @@ -141,11 +141,11 @@ else:

  16.          CC = 'gcc', CXX = 'g++',

  17.          options = opts)

  18.      # Take environment variables into account

  19. -    if os.environ.has_key('CXX'):

  20. +    if 'CXX' in os.environ:

  21.          env['CXX'] = os.environ['CXX']

  22. -    if os.environ.has_key('CXXFLAGS'):

  23. +    if 'CXXFLAGS' in os.environ:

  24.          env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])

  25. -    if os.environ.has_key('LDFLAGS'):

  26. +    if 'LDFLAGS' in os.environ:

  27.          env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])

  28.      check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h']

  29.      check_libs = []

  30. @@ -232,7 +232,7 @@ def distcopy (target, source, env):

  31.  def tarballer (target, source, env):            

  32.      cmd = 'tar -jcf "%s" -C "%s" .'  % ( str(target[0]), str(source[0]) )

  33.      #cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~' "

  34. -    print 'running ', cmd, ' ... '

  35. +    print ('running ', cmd, ' ... ')

  36.      p = os.popen (cmd)

  37.      return p.close ()

  38.  

  39. @@ -362,11 +362,11 @@ env.ParseConfig('pkg-config bullet --lib

  40.  conf = Configure(env)

  41.  for header in check_headers:

  42.      if not conf.CheckCXXHeader(header):

  43. -        print 'You do not have the %s headers installed. Exiting.' % header

  44. +        print ('You do not have the %s headers installed. Exiting.' % header)

  45.          Exit(1)

  46.  for lib in check_libs:

  47.      if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]):

  48. -        print lib[3]

  49. +        print (lib[3])

  50.          Exit(1)

  51.  

  52.  env = conf.Finish()

  53. @@ -535,4 +535,5 @@ if 'data-package' in COMMAND_LINE_TARGET

  54.  if 'autopackage' in COMMAND_LINE_TARGETS:

  55.      os.system("CXX1=g++-3.4 CXX2=g++-4.1 APBUILD_CXX1=g++-3.4 APBUILD_NO_STATIC_X=1 VDRIFT_VERSION=%s VDRIFT_MINIMAL=%d VDRIFT_RELEASE=%d makepackage tools/autopackage/vdrift.apspec" % (version, env['minimal'], env['release']))

  56.  

  57. -SConscript('src/SConscript', variant_dir = build_dir, duplicate = 0)

  58. +VariantDir(build_dir, '.', duplicate = 0)

  59. +SConscript('src/SConscript')