linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3218
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2013-03-16 14:23:43 +0100
message:
  embed the manifest in dwt tests (to have common controls 6)
modified:
  dwt/test/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 'dwt/test/SConscript'
--- dwt/test/SConscript	2013-01-18 21:28:38 +0000
+++ dwt/test/SConscript	2013-03-16 13:23:43 +0000
@@ -8,6 +8,15 @@
 
 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'))
+
 # imitate build_util's prepare_build
 env.VariantDir(dev.get_build_path(source_path), '.', duplicate = 0)
 if env['msvcproj']:
@@ -17,7 +26,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, dev.dwt, dev.dwarf, dev.boost, dev.bzip2, dev.intl]))
+		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]))
 
 env.Help("\nYou can build dwt tests by running 'scons dwt/test'\n")