linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3392
committer: Crise <crise@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2014-01-11 13:02:17 +0200
message:
  redo rev 3390, using CheckLib() and fixing --clean again
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 20:32:55 +0000
+++ SConstruct	2014-01-11 11:02:17 +0000
@@ -342,7 +342,8 @@
 )
 
 if dev.is_win32():
-    if conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
+    # some mingw distros have one but not the other, breaking linking (note: CheckLib functions do not support explicit include_quotes)
+    if conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>') and conf.CheckLib('htmlhelp', 'main', None, 'C++'):
         conf.env.Append(CPPDEFINES='HAVE_HTMLHELP_H')
 
 if 'mingw' in env['TOOLS']:
@@ -356,7 +357,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'])