linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2256
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-07 19:16:37 +0200
message:
  fix htmlhelp check
modified:
  SConstruct
  win32/SConscript


--
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	2010-10-05 21:48:07 +0000
+++ SConstruct	2010-10-07 17:16:37 +0000
@@ -214,11 +214,10 @@
 env.Append(BUILDERS = {'PotBuild' : pot_bld})
 
 conf = Configure(env)
-if conf.CheckCHeader("htmlhelp.h"):
-	conf.env.Append(CPPDEFINES="HAVE_HTMLHELP_H")
-	conf.env.Append(LIBS="htmlhelp")
-if conf.CheckCHeader("natupnp.h"):
-	conf.env.Append(CPPDEFINES="HAVE_NATUPNP_H")
+if conf.CheckCXXHeader(['windows.h', 'htmlhelp.h'], '<>'):
+	conf.env.Append(CPPDEFINES='HAVE_HTMLHELP_H')
+if conf.CheckCXXHeader('natupnp.h', '<>'):
+	conf.env.Append(CPPDEFINES='HAVE_NATUPNP_H')
 env = conf.Finish()
 
 dev.zlib = dev.build('zlib/')

=== modified file 'win32/SConscript'
--- win32/SConscript	2010-10-05 21:48:07 +0000
+++ win32/SConscript	2010-10-07 17:16:37 +0000
@@ -14,11 +14,12 @@
 
 if 'HAVE_HTMLHELP_H' in env['CPPPATH']:
 	env.Append(LIBS='htmlhelp')
-		
+
 env.Append(LIBS = ['comctl32', 'ws2_32', 'ole32', 'gdi32', 'comdlg32', 'iphlpapi', 'winmm', 'shlwapi', 'oleaut32', 'uuid'])
+
 env.Append(CPPPATH = ['#/openssl/include', '#/miniupnpc', '#/dwt/include', '#/'])
+
 openssl_lib = '#/openssl/lib/'
-
 if env['arch'] != 'x86':
 	openssl_lib += env['arch'] + '/'
 env.Append(LIBPATH = [openssl_lib])