1.1 --- a/configure.py	Sat Dec 28 08:42:50 2013 -0500
     1.2 +++ b/configure.py	Mon Dec 30 17:50:56 2013 -0500
     1.3 @@ -1,8 +1,19 @@
     1.4  # vim: set ts=2 sw=2 tw=99 noet:
     1.5  import sys
     1.6 -import ambuild.runner as runner
     1.7 +try:
     1.8 +	from ambuild2 import run
     1.9 +except:
    1.10 +	try:
    1.11 +		import ambuild
    1.12 +		sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n')
    1.13 +		sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n')
    1.14 +	except:
    1.15 +		sys.stderr.write('AMBuild must be installed to build this project.\n')
    1.16 +		sys.stderr.write('http://www.alliedmods.net/ambuild\n')
    1.17 +	sys.exit(1)
    1.18  
    1.19 -run = runner.Runner()
    1.20 +run = run.PrepareBuild(sourcePath=sys.path[0])
    1.21 +run.default_build_folder = 'obj-' + run.target_platform
    1.22  run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
    1.23                         help='Enable debugging symbols')
    1.24  run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
    1.25 @@ -12,4 +23,4 @@
    1.26  run.options.add_option('-s', '--sdks', default='all', dest='sdks',
    1.27                         help='Build against specified SDKs; valid args are "all", "present", or '
    1.28                              'comma-delimited list of engine names (default: %default)')
    1.29 -run.Configure(sys.path[0])
    1.30 +run.Configure()