linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2242
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Tue 2010-09-14 22:47:48 +0200
message:
  build fix
modified:
  intl/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 'intl/SConscript'
--- intl/SConscript	2010-09-14 20:38:28 +0000
+++ intl/SConscript	2010-09-14 20:47:48 +0000
@@ -3,9 +3,14 @@
 if dev.is_win32():
 	env, target, sources = dev.prepare_build(source_path, 'aintl', '*.c', in_bin=False)
 
-	env.Append(CPPDEFINES=['LOCALEDIR=\'""\'', 'LOCALE_ALIAS_PATH=\'""\'', 'INSTALLDIR=\'""\'', 'LIBDIR=\'""\'',
-		'IN_LIBINTL', 'ENABLE_RELOCATABLE=1', 'NO_XMALLOC', 'HAVE_CONFIG_H',
-		'set_relocation_prefix=libintl_set_relocation_prefix', 'relocate=libintl_relocate'])
+	if env['CC'] == 'cl': # MSVC
+		empty_str = '\\"\\"'
+	else:
+		empty_str = '\'""\''
+	env.Append(CPPDEFINES = ['LOCALEDIR=' + empty_str, 'LOCALE_ALIAS_PATH=' + empty_str,
+		'INSTALLDIR=' + empty_str, 'LIBDIR=' + empty_str, 'IN_LIBINTL', 'ENABLE_RELOCATABLE=1',
+		'NO_XMALLOC', 'HAVE_CONFIG_H', 'set_relocation_prefix=libintl_set_relocation_prefix',
+		'relocate=libintl_relocate'])
 	env.Append(CPPPATH='#/intl')
 
 	dev.env.Append(LIBS=['aintl'])