--- SConstruct.bak 2019-08-01 10:22:56.403182609 -0500 +++ SConstruct 2019-08-01 10:23:29.246148824 -0500 @@ -24,13 +24,13 @@ except: pass -print "NPVERSION = " + NPVERSION -print "SVERSION = " + SVERSION +print("NPVERSION = " + NPVERSION) +print("SVERSION = " + SVERSION) if NPVERSION == '' and SVERSION != '': NPVERSION = 'svn-' + SVERSION; thisplatform = sys.platform; -print 'Building version ' + NPVERSION + ' in ' + thisplatform +print('Building version ' + NPVERSION + ' in ' + thisplatform) ################################################################ # Fix compiling with long lines in windows @@ -46,9 +46,9 @@ data, err = proc.communicate() rv = proc.wait() if rv: - print "=====" - print err - print "=====" + print("=====") + print(err) + print("=====") return rv def SetupSpawn( env ): @@ -120,7 +120,7 @@ exeappend = '' if env['cross'] == 'mingw': - print 'configuring for mingw cross compilation' + print('configuring for mingw cross compilation') env.Tool('crossmingw', toolpath = ['.']) env.Append( CCFLAGS = [ '-D_WIN32_WINNT=0x0501' ] ) env.Append( LDFLAGS = [ '-mwindows' ] ) @@ -242,7 +242,7 @@ """ env.Append( NPSOURCES = globSources(env, 'src/NetPanzer', npdirs, "*.cpp") ) -if env.has_key('WINICON'): +if 'WINICON' in env: env.Append( NPSOURCES = env['WINICON'] ) env.Prepend( LIBS = ['np2d','lua-5.1','npnetwork','nplibs','physfs'] ) --- SConstruct~ 2019-08-01 10:25:16.000000000 -0500 +++ SConstruct 2019-08-01 10:26:05.276988317 -0500 @@ -175,11 +175,11 @@ '/Library/Frameworks/SDL_mixer.framework/Headers' ] ) networkenv.Append( CPPPATH = ['/Library/Frameworks/SDL.framework/Headers'] ) if env['universal'] != 'false': - env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) - luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) - physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) - networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) - env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] ) + env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] ) + env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] ) else: env.Append( CCFLAGS = [ '-arch', 'i386' ] ) luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] )