[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4320/Source

Modified Files:
	SConscript 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SConscript	14 Mar 2004 04:19:23 -0000	1.6
--- SConscript	19 Mar 2004 08:57:14 -0000	1.7
***************
*** 3,19 ****
  # SimData: Data Infrastructure for Simulations
  # Copyright (C) 2002, 2003 Mark Rose <tm...@st...>
! # 
  # This file is part of SimData.
! # 
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public License
  # as published by the Free Software Foundation; either version 2
  # of the License, or (at your option) any later version.
! # 
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
! # 
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
--- 3,19 ----
  # SimData: Data Infrastructure for Simulations
  # Copyright (C) 2002, 2003 Mark Rose <tm...@st...>
! #
  # This file is part of SimData.
! #
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public License
  # as published by the Free Software Foundation; either version 2
  # of the License, or (at your option) any later version.
! #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
! #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
***************
*** 142,146 ****
  	""".split()
  
! package_files = Prefix("#/SimData", 
  	"""
  	__init__.py
--- 142,146 ----
  	""".split()
  
! package_files = Prefix("#/SimData",
  	"""
  	__init__.py
***************
*** 186,197 ****
  
  # main libraries
! shared_library = env.SharedLibrary('#/SimData/_cSimData', 
                                     sources + [extension_wrapper],
! 				   SHLIBPREFIX = '', 
! 				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
! static_library = env.StaticLibrary('#/SimData/libSimData', sources)
  
- libraries = [shared_library, static_library]
  package_targets = libraries + [package_module]
  
--- 186,202 ----
  
  # main libraries
! libraries = []
! 
! shared_library = env.SharedLibrary('#/SimData/_cSimData',
                                     sources + [extension_wrapper],
!                                    SHLIBPREFIX = '',
!                                    LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
! ExpandList(libraries, shared_library)
! 
! if env['PLATFORM'] != 'win32':
!   static_library = env.StaticLibrary('#/SimData/libSimData', sources)
!   ExpandList(libraries, static_library)
  
  package_targets = libraries + [package_module]