comparison engine/SConscript @ 414:92433f507feb

Removed the install-dlls target and made the dll install part of both the fife-python (copies dlls to the <fife>/engine/python/fife dir) and install-python (copies dlls to <python>/site-packages/fife) [t:430]
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 02 Feb 2010 21:39:11 +0000
parents 10ac0c080564
children a21915a97237
comparison
equal deleted inserted replaced
413:10ac0c080564 414:92433f507feb
201 Alias('projects',[alias_msvc, alias_msvc9, alias_cbwin32, alias_cblinux]) 201 Alias('projects',[alias_msvc, alias_msvc9, alias_cbwin32, alias_cblinux])
202 202
203 alias_shared = Alias('fife-shared', sharedlib) 203 alias_shared = Alias('fife-shared', sharedlib)
204 alias_static = Alias('fife-static', staticlib) 204 alias_static = Alias('fife-static', staticlib)
205 alias_swig = Alias('fife-swig', [pythonext, copy_cmd2, copy_cmd3]) 205 alias_swig = Alias('fife-swig', [pythonext, copy_cmd2, copy_cmd3])
206 alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig]) 206
207 if sys.platform == 'win32':
208 alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig, install_dlls2])
209 else:
210 alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig])
211
207 Alias('fife', [alias_shared, alias_static, alias_python]) 212 Alias('fife', [alias_shared, alias_static, alias_python])
208
209 if sys.platform == 'win32':
210 Alias('install-dlls', [install_dlls, install_dlls2])
211
212 alias_install_shared = Alias('install-shared', install_shared) 213 alias_install_shared = Alias('install-shared', install_shared)
213 alias_install_static = Alias('install-static', install_static) 214 alias_install_static = Alias('install-static', install_static)
214 alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions]) 215
216 if sys.platform == 'win32':
217 alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions, install_dlls])
218 else:
219 alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions])
220
215 alias_install_dev = Alias('install-dev', [alias_install_shared, alias_install_static, install_headers]) 221 alias_install_dev = Alias('install-dev', [alias_install_shared, alias_install_static, install_headers])
216 Alias('install-all', [alias_install_python, alias_install_dev]) 222 Alias('install-all', [alias_install_python, alias_install_dev])