linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 3391: revert rev 3390 (the "help" param only controls whether help files should be compiled)

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 10 Jan 2014 20:35:33 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3391
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2014-01-10 21:32:55 +0100
message:
  revert rev 3390 (the "help" param only controls whether help files should be compiled)
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	2014-01-10 13:29:05 +0000
+++ SConstruct	2014-01-10 20:32:55 +0000
@@ -342,7 +342,7 @@
 )
 
 if dev.is_win32():
-    if env['help'] and conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
+    if 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 env['TOOLS'] and env['mode'] == 'debug':
+if 'gcc' in conf.env['TOOLS'] and conf.env['mode'] == 'debug':
     if conf.CheckFlag('-Og'):
         conf.env.Append(CCFLAGS=['-Og'])
         conf.env.Append(LINKFLAGS=['-Og'])