[Ecell-cvs] SF.net SVN: ecell:[3298] ecell3/branches/ecell-3.1

[<mor...@us...>]

Revision: 3298
          http://ecell.svn.sourceforge.net/ecell/?rev=3298&view=rev
Author:   moriyoshi
Date:     2008-12-03 20:11:55 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
* Win32 build fix.

Modified Paths:
--------------
    ecell3/branches/ecell-3.1/build/msvc/dist.wsf
    ecell3/branches/ecell-3.1/build/msvc/dm/PythonFluxProcess.vcproj
    ecell3/branches/ecell-3.1/build/msvc/dm/PythonProcess.vcproj
    ecell3/branches/ecell-3.1/build/msvc/model-editor.vcproj
    ecell3/branches/ecell-3.1/build/msvc/session-monitor.vcproj
    ecell3/branches/ecell-3.1/ecell/pyecell/setup.py.in

Modified: ecell3/branches/ecell-3.1/build/msvc/dist.wsf
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/build/msvc/dm/PythonFluxProcess.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/dm/PythonFluxProcess.vcproj	2008-11-28 05:06:23 UTC (rev 3297)
+++ ecell3/branches/ecell-3.1/build/msvc/dm/PythonFluxProcess.vcproj	2008-12-03 20:11:55 UTC (rev 3298)
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib python25_d.lib boost_python-gd.lib"
+				AdditionalDependencies="ecs.lib python*_d.lib $(BOOST_PYTHON_LIB_NAME)-gd.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
 				GenerateDebugInformation="true"
@@ -143,7 +143,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib python25_d.lib boost_python-gd.lib"
+				AdditionalDependencies="ecs.lib python*_d.lib $(BOOST_PYTHON_LIB_NAME)-gd.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
 				GenerateDebugInformation="true"
@@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib python25.lib boost_python.lib"
+				AdditionalDependencies="ecs.lib python*.lib $(BOOST_PYTHON_LIB_NAME).lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
 				GenerateDebugInformation="true"
@@ -298,7 +298,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib python25.lib boost_python.lib"
+				AdditionalDependencies="ecs.lib python*.lib $(BOOST_PYTHON_LIB_NAME).lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
 				GenerateDebugInformation="true"

Modified: ecell3/branches/ecell-3.1/build/msvc/dm/PythonProcess.vcproj
===================================================================
--- ecell3/branches/ecell-3.1/build/msvc/dm/PythonProcess.vcproj	2008-11-28 05:06:23 UTC (rev 3297)
+++ ecell3/branches/ecell-3.1/build/msvc/dm/PythonProcess.vcproj	2008-12-03 20:11:55 UTC (rev 3298)
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib gsl.lib python25_d.lib boost_python-gd.lib"
+				AdditionalDependencies="ecs.lib gsl.lib python*_d.lib $(BOOST_PYTHON_LIB_NAME)-gd.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
 				IgnoreDefaultLibraryNames=""
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib gsl.lib python25_d.lib boost_python-gd.lib"
+				AdditionalDependencies="ecs.lib gsl.lib python*_d.lib $(BOOST_PYTHON_LIB_NAME)-gd.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
 				IgnoreDefaultLibraryNames=""
@@ -221,7 +221,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib gsl.lib python25.lib boost_python.lib"
+				AdditionalDependencies="ecs.lib gsl.lib python*.lib $(BOOST_PYTHON_LIB_NAME).lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB)"
 				GenerateDebugInformation="true"
@@ -300,7 +300,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ecs.lib gsl.lib python25.lib boost_python.lib"
+				AdditionalDependencies="ecs.lib gsl.lib python*.lib $(BOOST_PYTHON_LIB_NAME).lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)$(PlatformName)\$(ConfigurationName);$(ECELL_STAGING_HOME)\$(PlatformName)\$(ConfigurationName)\lib;$(LIB64)"
 				GenerateDebugInformation="true"

Modified: ecell3/branches/ecell-3.1/build/msvc/model-editor.vcproj
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/build/msvc/session-monitor.vcproj
===================================================================
(Binary files differ)

Modified: ecell3/branches/ecell-3.1/ecell/pyecell/setup.py.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/setup.py.in	2008-11-28 05:06:23 UTC (rev 3297)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/setup.py.in	2008-12-03 20:11:55 UTC (rev 3298)
@@ -5,11 +5,11 @@
 from numpy.distutils.core import setup, Extension
 
 include_dirs = [
-    '@DMTOOL_INCLUDE_DIR@',
+    r'@DMTOOL_INCLUDE_DIR@',
     os.environ['INCLTDL'][2:],
-    '@top_srcdir@',
-    '@top_srcdir@/libecs',
-    '@top_srcdir@/libemc',
+    r'@top_srcdir@',
+    r'@top_srcdir@/libecs',
+    r'@top_srcdir@/libemc',
     ]
 
 common_libraries = [
@@ -17,7 +17,7 @@
     'gsl'
     ]
 
-ecell_staging_home = '@abs_top_builddir@/tmp'
+ecell_staging_home = r'@abs_top_builddir@/tmp'
 
 setup(
     name = 'E-Cell',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.