Merge authors:
Crise (markuwil)
------------------------------------------------------------
revno: 3390 [merge]
committer: Crise <[email protected]>
branch nick: trunk
timestamp: Fri 2014-01-10 15:45:27 +0200
message:
build fixes
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 2013-12-06 23:34:21 +0000
+++ SConstruct 2014-01-10 13:29:05 +0000
@@ -342,7 +342,7 @@
)
if dev.is_win32():
- if conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
+ if env['help'] and conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
conf.env.Append(CPPDEFINES='HAVE_HTMLHELP_H')
if 'mingw' in env['TOOLS']:
@@ -356,7 +356,7 @@
):
conf.env.Append(CPPDEFINES='HAVE_OLD_MINGW')
-if 'gcc' in conf.env['TOOLS'] and conf.env['mode'] == 'debug':
+if 'gcc' in env['TOOLS'] and env['mode'] == 'debug':
if conf.CheckFlag('-Og'):
conf.env.Append(CCFLAGS=['-Og'])
conf.env.Append(LINKFLAGS=['-Og'])
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
