linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3029
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-08-26 19:26:56 +0200
message:
  fix x64 plugin build
modified:
  plugins/Dev/SConscript
  plugins/Example/SConscript
  plugins/Script/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 'plugins/Dev/SConscript'
--- plugins/Dev/SConscript	2012-07-20 14:43:48 +0000
+++ plugins/Dev/SConscript	2012-08-26 17:26:56 +0000
@@ -12,7 +12,7 @@
 
 if 'g++' in env['LINK']:
 	env.Append(SHLINKFLAGS = '-Wl,--add-stdcall-alias')
-elif 'link' in env['LINK']:
+elif 'link' in env['LINK'] and env['arch'] == 'x86':
 	sources.append('Plugin.def')
 
 ret = dev.build_lib(env, target, [sources, res, dev.boost], shared = True)

=== modified file 'plugins/Example/SConscript'
--- plugins/Example/SConscript	2012-07-19 21:58:04 +0000
+++ plugins/Example/SConscript	2012-08-26 17:26:56 +0000
@@ -9,7 +9,7 @@
 
 if 'g++' in env['LINK']:
 	env.Append(SHLINKFLAGS = '-Wl,--add-stdcall-alias')
-elif 'link' in env['LINK']:
+elif 'link' in env['LINK'] and env['arch'] == 'x86':
 	sources.append('Plugin.def')
 
 ret = dev.build_lib(env, target, [sources, res], shared = True)

=== modified file 'plugins/Script/SConscript'
--- plugins/Script/SConscript	2012-08-25 13:31:50 +0000
+++ plugins/Script/SConscript	2012-08-26 17:26:56 +0000
@@ -9,7 +9,7 @@
 
 if 'g++' in env['LINK']:
 	env.Append(SHLINKFLAGS = '-Wl,--add-stdcall-alias')
-elif 'link' in env['LINK']:
+elif 'link' in env['LINK'] and env['arch'] == 'x86':
 	sources.append('Plugin.def')
 
 ret = dev.build_lib(env, target, [sources, res, dev.build('lua/'), dev.boost], shared = True)