← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2246: build fix

 

------------------------------------------------------------
revno: 2246
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-09-22 17:23:13 +0200
message:
  build fix
modified:
  installer/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 'installer/SConscript'
--- installer/SConscript	2010-09-21 20:28:03 +0000
+++ installer/SConscript	2010-09-22 15:23:13 +0000
@@ -107,7 +107,7 @@
 				xml_file = build_path + 'Strings.xml'
 				# translate our strings
 				env.Execute(env['po4a_cmd']('po4a-translate', '-m "installer/Strings.xml" -l "' + xml_file + '" -p "' + nixify(str(node)) + '" -k 0'))
-				# parse translated strings to generate message catalogs suitable for the installer
+				# parse translated strings to generate a message catalog included by i18n.nsh
 				f_nsh = codecs.open(build_path + '_' + name + '.nsh', 'wb', 'utf_8')
 				f_nsh.write('!insertmacro LANGFILE_EXT "' + name + '"\n')
 				dom = parse(xml_file)

=== modified file 'win32/SConscript'
--- win32/SConscript	2010-06-18 12:09:55 +0000
+++ win32/SConscript	2010-09-22 15:23:13 +0000
@@ -5,7 +5,7 @@
 env, target, sources = dev.prepare_build(source_path, 'DCPlusPlus', precompiled_header = 'stdafx')
 
 if env['CC'] == 'cl': # MSVC
-	if dev.mode == 'debug':
+	if env['mode'] == 'debug':
 		env.Prepend(LIBS = ['ssleay32d', 'libeay32d'])
 	else:
 		env.Prepend(LIBS = ['ssleay32', 'libeay32'])