diff --git a/SConstruct b/SConstruct
index f2e5789..704cad3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -75,31 +75,31 @@ def configure(env):
env.Append(CPPDEFINES=["HAVE_CONFIG_H"])
#Simple checks for required libraries
if not conf.CheckLib("SDL") and not server_only:
- print "Could not find libSDL"
+ print("Could not find libSDL")
missing.append("SDL")
if not conf.CheckLib("SDL_ttf") and not server_only:
- print "Could not find libSDL_ttf"
+ print("Could not find libSDL_ttf")
missing.append("SDL_ttf")
if not conf.CheckLib("SDL_image") and not server_only:
- print "Could not find libSDL_image"
+ print("Could not find libSDL_image")
missing.append("SDL_image")
if not conf.CheckLib("SDL_net") and not server_only:
- print "Could not find libSDL_net"
+ print("Could not find libSDL_net")
missing.append("SDL_net")
if not conf.CheckLib("speex") or not conf.CheckCXXHeader("speex/speex.h") and not server_only:
- print "Could not find libspeex or could not find 'speex/speex.h'"
+ print("Could not find libspeex or could not find 'speex/speex.h'")
missing.append("speex")
if not conf.CheckLib("vorbisfile") and not server_only:
- print "Could not find libvorbisfile"
+ print("Could not find libvorbisfile")
missing.append("vorbisfile")
if not conf.CheckLib("vorbis") and not server_only:
- print "Could not find libvorbis"
+ print("Could not find libvorbis")
missing.append("vorbis")
if not conf.CheckLib("ogg") and not server_only:
- print "Could not find libogg"
+ print("Could not find libogg")
missing.append("ogg")
if not conf.CheckCXXHeader("zlib.h"):
- print "Could not find zlib.h"
+ print("Could not find zlib.h")
missing.append("zlib")
else:
if conf.CheckLib("z"):
@@ -107,7 +107,7 @@ def configure(env):
elif conf.CheckLib("zlib1"):
env.Append(LIBS="zlib1")
else:
- print "Could not find libz or zlib1.dll"
+ print("Could not find libz or zlib1.dll")
missing.append("zlib")
boost_thread = ''
@@ -119,7 +119,7 @@ def configure(env):
boost_thread="boost_thread-mt"
boost_system="boost_system-mt"
else:
- print "Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp"
+ print("Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp")
missing.append("libboost_thread")
env.Append(LIBS=[boost_thread, boost_system])
env.Append(LIBS="pthread")
@@ -130,31 +130,31 @@ def configure(env):
elif conf.CheckLib("boost_date_time-mt") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
boost_date_time="boost_date_time-mt"
else:
- print "Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp"
+ print("Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp")
missing.append("libboost_date_time")
env.Append(LIBS=[boost_date_time])
if not conf.CheckCXXHeader("boost/shared_ptr.hpp"):
- print "Could not find boost/shared_ptr.hpp"
+ print("Could not find boost/shared_ptr.hpp")
missing.append("boost/shared_ptr.hpp")
if not conf.CheckCXXHeader("boost/tuple/tuple.hpp"):
- print "Could not find boost/tuple/tuple.hpp"
+ print("Could not find boost/tuple/tuple.hpp")
missing.append("boost/tuple/tuple.hpp")
if not conf.CheckCXXHeader("boost/tuple/tuple_comparison.hpp"):
- print "Could not find boost/tuple/tuple_comparison.hpp"
+ print("Could not find boost/tuple/tuple_comparison.hpp")
missing.append("boost/tuple/tuple_comparison.hpp")
if not conf.CheckCXXHeader("boost/logic/tribool.hpp"):
- print "Could not find boost/logic/tribool.hpp"
+ print("Could not find boost/logic/tribool.hpp")
missing.append("boost/logic/tribool.hpp")
if not conf.CheckCXXHeader("boost/lexical_cast.hpp"):
- print "Could not find boost/lexical_cast.hpp"
+ print("Could not find boost/lexical_cast.hpp")
missing.append("boost/lexical_cast.hpp")
#Do checks for OpenGL, which is different on every system
gl_libraries = []
if isDarwinPlatform and not server_only:
- print "Using Apple's OpenGL framework"
+ print("Using Apple's OpenGL framework")
env.Append(FRAMEWORKS="OpenGL")
elif conf.CheckLib("GL") and conf.CheckCXXHeader("GL/gl.h") and not server_only:
gl_libraries.append("GL")
@@ -163,12 +163,12 @@ def configure(env):
elif conf.CheckLib("opengl32") and conf.CheckCXXHeader("GL/gl.h") and not server_only:
gl_libraries.append("opengl32")
elif not server_only:
- print "Could not find libGL or opengl32, or could not find GL/gl.h or OpenGL/gl.h"
+ print("Could not find libGL or opengl32, or could not find GL/gl.h or OpenGL/gl.h")
missing.append("OpenGL")
#Do checks for GLU, which is different on every system
if isDarwinPlatform and not server_only:
- print "Using Apple's GLUT framework"
+ print("Using Apple's GLUT framework")
env.Append(FRAMEWORKS="GLUT")
elif conf.CheckLib('GLU') and conf.CheckCXXHeader("GL/glu.h") and not server_only:
gl_libraries.append("GLU")
@@ -177,7 +177,7 @@ def configure(env):
elif conf.CheckLib('glu32') and conf.CheckCXXHeader('GL/glu.h') and not server_only:
gl_libraries.append("glu32")
elif not server_only:
- print "Could not find libGLU or glu32, or could not find GL/glu.h or OpenGL/glu.h"
+ print("Could not find libGLU or glu32, or could not find GL/glu.h or OpenGL/glu.h")
missing.append("GLU")
if gl_libraries or isDarwinPlatform:
@@ -192,31 +192,31 @@ def configure(env):
#Do checks for portaudio
if conf.CheckLib('portaudio') and conf.CheckCXXHeader('portaudio.h'):
if env['mingw'] or isWindowsPlatform:
- print "--------"
- print "NOTE: It appears you are compiling under Windows. At this stage, PortAudio crashes Globulation 2 when voice chat is used."
- print "NOTE: Disabling PortAudio in this build (you will be unable to use Voice Chat ingame)."
- print "--------"
+ print("--------")
+ print("NOTE: It appears you are compiling under Windows. At this stage, PortAudio crashes Globulation 2 when voice chat is used.")
+ print("NOTE: Disabling PortAudio in this build (you will be unable to use Voice Chat ingame).")
+ print("--------")
else:
if GetOption('portaudio'):
- print "trying to use portaudio"
+ print("trying to use portaudio")
configfile.add("HAVE_PORTAUDIO ", "Defined when Port Audio support is present and compiled")
env.Append(LIBS=['portaudio'])
else:
- print " no portaudio"
- print " no portaudio - although portaudio was found to be installed, you have "
- print " no portaudio - to explicitly activate it using: "
- print " no portaudio - $ scons --portaudio=true"
- print " no portaudio - this may not work properly if the version of portaudio"
- print " no portaudio - is wrong. portaudio is used to allow communicating over VOIP"
- print " no portaudio"
- print " no portaudio - if you know of a solution to detect portaudio version"
- print " no portaudio - let us know at:"
- print " no portaudio - https://savannah.nongnu.org/bugs/index.php?24668"
- print " no portaudio"
+ print(" no portaudio")
+ print(" no portaudio - although portaudio was found to be installed, you have ")
+ print(" no portaudio - to explicitly activate it using: ")
+ print(" no portaudio - $ scons --portaudio=true")
+ print(" no portaudio - this may not work properly if the version of portaudio")
+ print(" no portaudio - is wrong. portaudio is used to allow communicating over VOIP")
+ print(" no portaudio")
+ print(" no portaudio - if you know of a solution to detect portaudio version")
+ print(" no portaudio - let us know at:")
+ print(" no portaudio - https://savannah.nongnu.org/bugs/index.php?24668")
+ print(" no portaudio")
if missing:
for t in missing:
- print "Missing %s" % t
+ print("Missing %s" % t)
Exit(1)
conf.Finish()
@@ -236,7 +236,7 @@ def main():
env.Clone = env.Copy
if not env['CC']:
- print "No compiler found in PATH. Please install gcc or another compiler."
+ print("No compiler found in PATH. Please install gcc or another compiler.")
Exit(1)
env["VERSION"] = "0.9.4.4"
diff --git a/SConstruct b/SConstruct
index 704cad3..0f227bf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -117,7 +117,7 @@ def configure(env):
boost_system="boost_system"
elif conf.CheckLib("boost_thread-mt") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
boost_thread="boost_thread-mt"
- boost_system="boost_system-mt"
+ boost_system="boost_system-mt"
else:
print("Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp")
missing.append("libboost_thread")
diff --git a/scons/bundle.py b/scons/bundle.py
index 9005349..3e069dc 100644
--- a/scons/bundle.py
+++ b/scons/bundle.py
@@ -4,10 +4,10 @@ sys.path.append( os.path.dirname(__file__) )
from addDependentLibsToBundle import addDependentLibsToBundle
def run(command) :
- print "\033[32m:: ", command, "\033[0m"
+ print("\033[32m:: ", command, "\033[0m")
return os.system(command)
def norun(command) :
- print "\033[31mXX ", command, "\033[0m"
+ print("\033[31mXX ", command, "\033[0m")
@@ -46,7 +46,7 @@ def bundleEmitter(target, source, env):
return target, source
def generate(env) :
- print "Loading Bundle tool"
+ print("Loading Bundle tool")
Builder = SCons.Builder.Builder
Action = SCons.Action.Action
bundleBuilder = Builder(
diff --git a/scons/addDependentLibsToBundle.py b/scons/addDependentLibsToBundle.py
index 77170f6..6a5c170 100755
--- a/scons/addDependentLibsToBundle.py
+++ b/scons/addDependentLibsToBundle.py
@@ -4,10 +4,10 @@ import os, glob
import sys
def run(command) :
- print "\033[32m:: ", command, "\033[0m"
+ print("\033[32m:: ", command, "\033[0m")
return os.system(command)
def norun(command) :
- print "\033[31mXX ", command, "\033[0m"
+ print("\033[31mXX ", command, "\033[0m")
def needsChange(binary, blacklist) :
diff --git a/scons/addDependentLibsToBundle.py b/scons/addDependentLibsToBundle.py
index 6a5c170..b9d29e2 100755
--- a/scons/addDependentLibsToBundle.py
+++ b/scons/addDependentLibsToBundle.py
@@ -4,10 +4,10 @@ import os, glob
import sys
def run(command) :
- print("\033[32m:: ", command, "\033[0m")
+ print(("\033[32m:: ", command, "\033[0m"))
return os.system(command)
def norun(command) :
- print("\033[31mXX ", command, "\033[0m")
+ print(("\033[31mXX ", command, "\033[0m"))
def needsChange(binary, blacklist) :
diff --git a/scons/bundle.py b/scons/bundle.py
index 3e069dc..d4bc6a2 100644
--- a/scons/bundle.py
+++ b/scons/bundle.py
@@ -4,10 +4,10 @@ sys.path.append( os.path.dirname(__file__) )
from addDependentLibsToBundle import addDependentLibsToBundle
def run(command) :
- print("\033[32m:: ", command, "\033[0m")
+ print(("\033[32m:: ", command, "\033[0m"))
return os.system(command)
def norun(command) :
- print("\033[31mXX ", command, "\033[0m")
+ print(("\033[31mXX ", command, "\033[0m"))
diff --git a/scons/dmg.py b/scons/dmg.py
index 175d292..1455658 100644
--- a/scons/dmg.py
+++ b/scons/dmg.py
@@ -15,7 +15,7 @@ def create_dmg_message( target, source, env):
def generate(env) :
"""Add Builders and construction variables for qt to an Environment."""
- print "Lodading dmg tool..."
+ print("Lodading dmg tool...")
env.Append( BUILDERS={'Dmg' :
env.Builder( action=env.Action(create_dmg, create_dmg_message ))
} )
diff --git a/scons/nsis.py b/scons/nsis.py
index 76f19fc..55ac205 100644
--- a/scons/nsis.py
+++ b/scons/nsis.py
@@ -10,7 +10,7 @@ TODO:
def generate(env) :
"""Add Builders and construction variables for qt to an Environment."""
- print "Loading nsis tool..."
+ print("Loading nsis tool...")
Builder = SCons.Builder.Builder
@@ -22,7 +22,7 @@ def generate(env) :
contents = node.get_contents()
includes = nsisFiles_re.findall(contents)
includes = [ winToLocalReformat(include) for include in includes ]
- return filter(lambda x: x.rfind('*')==-1, includes)
+ return [x for x in includes if x.rfind('*')==-1]
nsisscanner = env.Scanner(name = 'nsisfile',
function = scanNsisContent,
argument = None,
