------------------------------------------------------------
revno: 3201
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Thu 2013-01-31 20:24:01 +0100
message:
hard-code a default prefix when building for x64
removed:
scripts/64.bat
modified:
SConstruct
build_util.py
--
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 2012-12-13 17:52:12 +0000
+++ SConstruct 2013-01-31 19:24:01 +0000
@@ -269,6 +269,7 @@
# a 32-bit program). the only differentiator is __MINGW64_VERSION_MAJOR.
if conf.CheckDeclaration('__MINGW64_VERSION_MAJOR', '#include <windows.h>', 'C++'):
conf.env.Append(CPPDEFINES='HAVE_MINGW64')
+ conf.env['pch'] = 0 # precompiled headers crash mingw64's gcc...
env = conf.Finish()
dev.boost = dev.build('boost/')
=== modified file 'build_util.py'
--- build_util.py 2012-11-05 20:39:11 +0000
+++ build_util.py 2013-01-31 19:24:01 +0000
@@ -35,11 +35,13 @@
self.env.Append(LINKFLAGS=["-Wl,--enable-runtime-pseudo-reloc"])
prefix = ''
- if self.env.get('prefix') is not None:
+ if self.env.get('prefix'):
prefix = self.env['prefix']
+ elif self.env['arch'] == 'x64':
+ prefix = 'x86_64-w64-mingw32-'
elif sys.platform != 'win32':
prefix = 'i386-mingw32-'
-
+
self.env['CC'] = prefix + 'gcc'
self.env['CXX'] = prefix + 'g++'
self.env['LINK'] = prefix + 'g++'
=== removed file 'scripts/64.bat'
--- scripts/64.bat 2011-01-27 22:57:05 +0000
+++ scripts/64.bat 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-cd ..
-call scons prefix=x86_64-w64-mingw32- arch=x64
-pause
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
