linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3338
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2013-08-08 20:48:28 +0200
message:
  fix Win build
modified:
  SConstruct
  build_util.py
  dcpp/File.h
  dcpp/SConscript
  dwt/src/SConscript
  dwt/src/util/SConscript
  dwt/src/util/win32/SConscript
  dwt/src/widgets/SConscript
  dwt/test/SConscript
  test/SConscript
  utils/SConscript
  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	2013-08-08 18:04:01 +0000
+++ SConstruct	2013-08-08 18:48:28 +0000
@@ -267,7 +267,7 @@
 env.Append(BUILDERS = {'PotBuild' : pot_bld})
 
 def CheckFlag(context, flag):
-	context.Message('Checking support for the ' + flag + ' flag...')
+	context.Message('Checking support for the ' + flag + ' flag... ')
 	prevFlags = context.env['CCFLAGS']
 	context.env.Append(CCFLAGS = [flag])
 	ret = context.TryCompile('int main() {}', '.cpp')
@@ -307,15 +307,21 @@
 dev.intl = dev.build('intl/') if dev.is_win32() else []
 dev.miniupnpc = dev.build('miniupnpc/')
 dev.natpmp = dev.build('natpmp/')
+dev.client = dev.build('dcpp/')
+
 dev.dwt = dev.build('dwt/src/') if dev.is_win32() else []
 if dev.is_win32():
 	dev.build('dwt/test/')
-dev.client = dev.build('dcpp/')
+
 if dev.is_win32():
 	dev.build('help/')
+
 dev.build('test/')
 dev.build('utils/')
+
 if dev.is_win32():
 	dev.build('win32/')
+
 	dev.build('installer/')
+
 dev.finalize()

=== modified file 'build_util.py'
--- build_util.py	2013-08-08 18:04:01 +0000
+++ build_util.py	2013-08-08 18:48:28 +0000
@@ -251,9 +251,19 @@
 
 	def add_dcpp(self, env):
 		if self.is_win32():
+			env.Append(CPPPATH = ['#/bzip2'])
+		env.Append(CPPPATH = ['#/geoip', '#/zlib'])
+
+		if self.is_win32():
 			env.Append(LIBS = ['gdi32', 'iphlpapi', 'ole32', 'ws2_32'])
 		else:
-			env.Append(LIBS = ['bz2', 'c', 'iconv', 'intl'])
+			env.Append(LIBS = ['bz2', 'c', 'iconv'])
+
+	def add_intl(self, env):
+		if self.is_win32():
+			env.Append(CPPPATH = ['#/intl'])
+		else:
+			env.Append(LIBS = ['intl'])
 
 	def add_openssl(self, env):
 		if self.is_win32():

=== modified file 'dcpp/File.h'
--- dcpp/File.h	2013-08-08 18:04:01 +0000
+++ dcpp/File.h	2013-08-08 18:48:28 +0000
@@ -23,7 +23,10 @@
 
 #ifdef _WIN32
 #include "w.h"
+
+#ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
+#endif
 
 #else
 #include <sys/stat.h>

=== modified file 'dcpp/SConscript'
--- dcpp/SConscript	2013-08-08 18:04:01 +0000
+++ dcpp/SConscript	2013-08-08 18:48:28 +0000
@@ -4,9 +4,10 @@
 
 env, target, sources = dev.prepare_build(source_path, 'dcpp', in_bin = False, precompiled_header = 'stdinc')
 
-if dev.is_win32():
-	env.Append(CPPPATH = ['#/boost', '#/bzip2', '#/intl', '#/openssl/include'])
-env.Append(CPPPATH = ['#/geoip', '#/zlib'])
+dev.add_boost(env)
+dev.add_dcpp(env)
+dev.add_intl(env)
+dev.add_openssl(env)
 
 env.Append(CPPDEFINES = ['BUILDING_DCPP=1'])
 

=== modified file 'dwt/src/SConscript'
--- dwt/src/SConscript	2012-03-03 15:04:23 +0000
+++ dwt/src/SConscript	2013-08-08 18:48:28 +0000
@@ -2,6 +2,8 @@
 
 env, target, sources = dev.prepare_build(source_path, 'dwt', in_bin = False, recursive=True)
 
+dev.add_boost(env)
+
 env.Append(CPPPATH = ['#/dwt/include'])
 
 def get_msvcproj_files(env):

=== modified file 'dwt/src/util/SConscript'
--- dwt/src/util/SConscript	2011-10-16 23:06:25 +0000
+++ dwt/src/util/SConscript	2013-08-08 18:48:28 +0000
@@ -2,6 +2,8 @@
 
 env, target, sources = dev.prepare_build(source_path, 'dwt', in_bin = False)
 
+dev.add_boost(env)
+
 env.Append(CPPPATH = ['#/dwt/include'])
 
 ret = [dev.build_lib(env, target, sources), dev.build('win32/')]

=== modified file 'dwt/src/util/win32/SConscript'
--- dwt/src/util/win32/SConscript	2011-10-16 23:06:25 +0000
+++ dwt/src/util/win32/SConscript	2013-08-08 18:48:28 +0000
@@ -2,6 +2,8 @@
 
 env, target, sources = dev.prepare_build(source_path, 'dwt', in_bin = False)
 
+dev.add_boost(env)
+
 env.Append(CPPPATH = ['#/dwt/include'])
 
 ret = dev.build_lib(env, target, sources)

=== modified file 'dwt/src/widgets/SConscript'
--- dwt/src/widgets/SConscript	2011-10-16 23:06:25 +0000
+++ dwt/src/widgets/SConscript	2013-08-08 18:48:28 +0000
@@ -2,6 +2,8 @@
 
 env, target, sources = dev.prepare_build(source_path, 'dwt', in_bin = False)
 
+dev.add_boost(env)
+
 env.Append(CPPPATH = ['#/dwt/include'])
 
 ret = dev.build_lib(env, target, sources)

=== modified file 'dwt/test/SConscript'
--- dwt/test/SConscript	2013-03-16 13:23:43 +0000
+++ dwt/test/SConscript	2013-08-08 18:48:28 +0000
@@ -4,18 +4,24 @@
 
 env = dev.env.Clone()
 
-env.Append(LIBS = ['comctl32', 'ws2_32', 'ole32', 'gdi32', 'comdlg32', 'iphlpapi', 'winmm', 'shlwapi', 'oleaut32', 'uuid', 'uxtheme'])
+dev.add_boost(env)
+
+if dev.is_win32():
+	env.Append(LIBS = ['comctl32', 'comdlg32', 'ole32', 'oleaut32', 'shlwapi', 'uuid', 'uxtheme', 'winmm'])
 
 env.Append(CPPPATH = ['#/dwt/include'])
 
-if env['RC'] == 'rc': # MSVC
-	env.Append(RCFLAGS = ['/d' + env['arch']])
-elif env['RC'].find('windres') != -1: # MinGW
-	env.Append(RCFLAGS = ['-D' + env['arch']])
-else:
-	print 'Unknown resource compiler.'
-	Return()
-res = env.RES(dev.get_sources(source_path, '*.rc'))
+res = []
+
+if dev.is_win32():
+	if env['RC'] == 'rc': # MSVC
+		env.Append(RCFLAGS = ['/d' + env['arch']])
+	elif env['RC'].find('windres') != -1: # MinGW
+		env.Append(RCFLAGS = ['-D' + env['arch']])
+	else:
+		print 'Unknown resource compiler.'
+		Return()
+	res = env.RES(dev.get_sources(source_path, '*.rc'))
 
 # imitate build_util's prepare_build
 env.VariantDir(dev.get_build_path(source_path), '.', duplicate = 0)
@@ -26,7 +32,7 @@
 	ret = []
 	for f in Glob('*.cpp'):
 		sources = dev.get_sources(source_path, str(f))
-		ret.append(env.Program(dev.get_target(source_path, os.path.basename(str(f)).replace('.cpp', ''), in_bin = False), [sources, res, dev.dwt, dev.dwarf, dev.boost, dev.bzip2, dev.intl]))
+		ret.append(dev.build_program(env, dev.get_target(source_path, os.path.basename(str(f)).replace('.cpp', ''), in_bin = False), [sources, res]))
 
 env.Help("\nYou can build dwt tests by running 'scons dwt/test'\n")
 

=== modified file 'test/SConscript'
--- test/SConscript	2013-08-08 18:04:01 +0000
+++ test/SConscript	2013-08-08 18:48:28 +0000
@@ -15,6 +15,7 @@
 dev.add_boost(env)
 dev.add_crashlog(env)
 dev.add_dcpp(env)
+dev.add_intl(env)
 dev.add_openssl(env)
 
 dev.force_console(env)

=== modified file 'utils/SConscript'
--- utils/SConscript	2013-08-08 18:04:01 +0000
+++ utils/SConscript	2013-08-08 18:48:28 +0000
@@ -6,6 +6,7 @@
 
 dev.add_boost(env)
 dev.add_dcpp(env)
+dev.add_intl(env)
 dev.add_openssl(env)
 
 dev.force_console(env)

=== modified file 'win32/SConscript'
--- win32/SConscript	2013-08-08 18:04:01 +0000
+++ win32/SConscript	2013-08-08 18:48:28 +0000
@@ -7,16 +7,16 @@
 dev.add_boost(env)
 dev.add_crashlog(env)
 dev.add_dcpp(env)
+dev.add_intl(env)
 dev.add_openssl(env)
 
 if dev.is_win32():
+	env.Append(CPPPATH = ['#/dwt/include'])
 	env.Append(LIBS = ['comctl32', 'comdlg32', 'oleaut32', 'shlwapi', 'uuid', 'uxtheme', 'winmm', 'wtsapi32'])
 
 if 'HAVE_HTMLHELP_H' in env['CPPDEFINES']:
 	env.Append(LIBS = ['htmlhelp'])
 
-env.Append(CPPPATH = ['#/bzip2', '#/dwt/include'])
-
 prog_sources = sources
 
 if dev.is_win32():