linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2257
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-07 19:25:06 +0200
message:
  fix htmlhelp check
modified:
  test/SConscript
  win32/MainWindow.cpp
  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 'test/SConscript'
--- test/SConscript	2009-12-10 22:49:56 +0000
+++ test/SConscript	2010-10-07 17:25:06 +0000
@@ -5,23 +5,24 @@
 env, target, sources = dev.prepare_build(source_path, 'testxml', source_glob='testxml.cpp', in_bin=False)
 
 if env['CC'] == 'cl': # MSVC
-	if dev.mode == 'debug':
+	if env['mode'] == 'debug':
 		env.Prepend(LIBS = ['ssleay32d', 'libeay32d'])
 	else:
 		env.Prepend(LIBS = ['ssleay32', 'libeay32'])
 else:
 	env.Prepend(LIBS = ['ssl', 'crypto'])
-	env.Append(CPPPATH = ['#/htmlhelp/include/'])
-	env.Append(LIBPATH = ['#/htmlhelp/lib/'])
-	
-env.Append(LIBS=["comctl32", "ws2_32", "ole32", "gdi32", "comdlg32", "winmm", "shlwapi", "htmlhelp", "oleaut32", "uuid"])
-env.Append(CPPPATH=['#/openssl/include', "#/dwt/include", "#/"])
+
+if 'HAVE_HTMLHELP_H' in env['CPPDEFINES']:
+	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])
+env.Append(LIBPATH = [openssl_lib])
 
 ret = env.Program(target, [sources, dev.client, dev.zlib, dev.bzip2, dev.dwt, dev.intl])
 Return('ret')
-

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2010-10-05 21:48:07 +0000
+++ win32/MainWindow.cpp	2010-10-07 17:25:06 +0000
@@ -72,6 +72,10 @@
 #include <dwt/LibraryLoader.h>
 #include <dwt/util/StringUtils.h>
 
+#ifdef HAVE_HTMLHELP_H
+#include <htmlhelp.h>
+#endif
+
 static dwt::IconPtr mainIcon(WinUtil::createIcon(IDI_DCPP, 32));
 static dwt::IconPtr mainSmallIcon(WinUtil::createIcon(IDI_DCPP, 16));
 

=== modified file 'win32/SConscript'
--- win32/SConscript	2010-10-07 17:16:37 +0000
+++ win32/SConscript	2010-10-07 17:25:06 +0000
@@ -12,7 +12,7 @@
 else:
 	env.Prepend(LIBS = ['ssl', 'crypto'])
 
-if 'HAVE_HTMLHELP_H' in env['CPPPATH']:
+if 'HAVE_HTMLHELP_H' in env['CPPDEFINES']:
 	env.Append(LIBS='htmlhelp')
 
 env.Append(LIBS = ['comctl32', 'ws2_32', 'ole32', 'gdi32', 'comdlg32', 'iphlpapi', 'winmm', 'shlwapi', 'oleaut32', 'uuid'])