linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2118
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Sun 2010-03-28 22:35:55 +0200
message:
  update the VS arch selection to work with SCons 1.3
modified:
  SConstruct


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription.

=== modified file 'SConstruct'
--- SConstruct	2009-12-10 22:49:56 +0000
+++ SConstruct	2010-03-28 20:35:55 +0000
@@ -90,11 +90,11 @@
 
 # workaround for SCons 1.2 which hard-codes possible archs (only allows 'x86' and 'amd64'...)
 # TODO remove when SCons knows about all available archs
-MSVS_ARCH = defEnv['arch']
-if MSVS_ARCH == 'x64':
-	MSVS_ARCH = 'amd64'
+TARGET_ARCH = defEnv['arch']
+if TARGET_ARCH == 'x64':
+	TARGET_ARCH = 'amd64'
 
-env = Environment(ENV = os.environ, tools = [defEnv['tools']], options = opts, MSVS_ARCH = MSVS_ARCH)
+env = Environment(ENV = os.environ, tools = [defEnv['tools']], options = opts, TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH)
 
 if 'mingw' not in env['TOOLS'] and 'gcc' in env['TOOLS']:
 	print "Non-mingw gcc builds not supported"