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-scons-python3.patch (3207B)

    

  1. --- ./src/SConscript.orig	2014-09-04 16:06:21.000000000 -0400
  2. +++ ./src/SConscript	2017-10-15 11:22:06.536446627 -0400
  3. @@ -151,7 +151,7 @@ src = Split("""
  4.  		utils.cpp
  5.  		window.cpp""")
  6.  
  7. -src.sort(lambda x, y: cmp(x.lower(),y.lower()))
  8. +src.sort(key=lambda x: x.lower())
  9.  
  10.  #------------------------#
  11.  # Copy Build Environment #
  12. --- ./SConstruct.orig	2014-08-04 08:43:04.000000000 -0400
  13. +++ ./SConstruct	2017-10-15 11:18:01.792656230 -0400
  14. @@ -92,9 +92,9 @@ elif sys.platform == 'darwin':
  15.  
  16.      for a in env['universal']:
  17.          if not sdk_path:
  18. -            print 'Building a universal binary require access to an ' + \
  19. +            print ('Building a universal binary require access to an ' + \
  20.                  'SDK that has universal \nbinary support.If you know ' + \
  21. -                'the location of such an SDK, specify it using the \n"SDK" option'
  22. +                'the location of such an SDK, specify it using the \n"SDK" option')
  23.              Exit(1)
  24.          env.Append( CCFLAGS = ['-arch', a],  LINKFLAGS = ['-arch', a] )
  25.  
  26. @@ -141,11 +141,11 @@ else:
  27.          CC = 'gcc', CXX = 'g++',
  28.          options = opts)
  29.      # Take environment variables into account
  30. -    if os.environ.has_key('CXX'):
  31. +    if 'CXX' in os.environ:
  32.          env['CXX'] = os.environ['CXX']
  33. -    if os.environ.has_key('CXXFLAGS'):
  34. +    if 'CXXFLAGS' in os.environ:
  35.          env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
  36. -    if os.environ.has_key('LDFLAGS'):
  37. +    if 'LDFLAGS' in os.environ:
  38.          env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
  39.      check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h']
  40.      check_libs = []
  41. @@ -232,7 +232,7 @@ def distcopy (target, source, env):
  42.  def tarballer (target, source, env):            
  43.      cmd = 'tar -jcf "%s" -C "%s" .'  % ( str(target[0]), str(source[0]) )
  44.      #cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~' "
  45. -    print 'running ', cmd, ' ... '
  46. +    print ('running ', cmd, ' ... ')
  47.      p = os.popen (cmd)
  48.      return p.close ()
  49.  
  50. @@ -362,11 +362,11 @@ env.ParseConfig('pkg-config bullet --lib
  51.  conf = Configure(env)
  52.  for header in check_headers:
  53.      if not conf.CheckCXXHeader(header):
  54. -        print 'You do not have the %s headers installed. Exiting.' % header
  55. +        print ('You do not have the %s headers installed. Exiting.' % header)
  56.          Exit(1)
  57.  for lib in check_libs:
  58.      if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]):
  59. -        print lib[3]
  60. +        print (lib[3])
  61.          Exit(1)
  62.  
  63.  env = conf.Finish()
  64. @@ -535,4 +535,5 @@ if 'data-package' in COMMAND_LINE_TARGET
  65.  if 'autopackage' in COMMAND_LINE_TARGETS:
  66.      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']))
  67.  
  68. -SConscript('src/SConscript', variant_dir = build_dir, duplicate = 0)
  69. +VariantDir(build_dir, '.', duplicate = 0)
  70. +SConscript('src/SConscript')