From d9e39d1b0ee3e25e2d4c1f252e0cb7e8437f1175 Mon Sep 17 00:00:00 2001 From: "Jason McCampbell (Enthought, Inc)" Date: Tue, 24 May 2011 14:24:59 -0500 Subject: [PATCH] Changed output directory to $(SolutionDir)/bin instead of $(SolutionDir)/bin/$(ConfigurationName) so that we can build debug or release version and the SciPy packages will find the most recent build. --- libndarray/windows/build.py | 2 +- .../NpyAccessLib/NpyAccessLib.vcxproj | 4 +- numpy/NumpyDotNet/NumpyDotNet.csproj | 8 +- numpy/NumpyDotNet/NumpyDotNet.sln | 132 ++++-------------- numpy/fft/fft.vcxproj | 12 +- numpy/linalg/lapack_lite.vcxproj | 10 +- numpy/random/mtrand/mtrand.vcxproj | 12 +- 7 files changed, 52 insertions(+), 128 deletions(-) mode change 100644 => 100755 libndarray/windows/build.py diff --git a/libndarray/windows/build.py b/libndarray/windows/build.py old mode 100644 new mode 100755 index 8d910432f..946ee8f13 --- a/libndarray/windows/build.py +++ b/libndarray/windows/build.py @@ -28,7 +28,7 @@ def write_config(): def main(): write_config() - os.system("msbuild /v:diag msvc2008.vcxproj") + os.system("msbuild.exe /v:diag msvc2008.vcxproj") # shutil.copy(r'Release\ndarray.dll', sys.prefix) diff --git a/numpy/NumpyDotNet/NpyAccessLib/NpyAccessLib.vcxproj b/numpy/NumpyDotNet/NpyAccessLib/NpyAccessLib.vcxproj index c0f312f72..bd94fc6e7 100644 --- a/numpy/NumpyDotNet/NpyAccessLib/NpyAccessLib.vcxproj +++ b/numpy/NumpyDotNet/NpyAccessLib/NpyAccessLib.vcxproj @@ -38,14 +38,14 @@ .dll - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\ true .dll - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\ false BuildCompile diff --git a/numpy/NumpyDotNet/NumpyDotNet.csproj b/numpy/NumpyDotNet/NumpyDotNet.csproj index b40050460..d3291b1fe 100755 --- a/numpy/NumpyDotNet/NumpyDotNet.csproj +++ b/numpy/NumpyDotNet/NumpyDotNet.csproj @@ -17,7 +17,7 @@ true full false - bin\Debug\ + bin\ DEBUG;TRACE prompt 4 @@ -27,7 +27,7 @@ pdbonly true - bin\Release\ + bin\ TRACE prompt 4 @@ -35,7 +35,7 @@ true - bin\Debug\ + bin\ DEBUG;TRACE true full @@ -53,7 +53,7 @@ true - bin\Release\ + bin\ DEBUG;TRACE true full diff --git a/numpy/NumpyDotNet/NumpyDotNet.sln b/numpy/NumpyDotNet/NumpyDotNet.sln index 9dcd85748..8e98e4a8d 100755 --- a/numpy/NumpyDotNet/NumpyDotNet.sln +++ b/numpy/NumpyDotNet/NumpyDotNet.sln @@ -21,14 +21,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mtrand", "..\random\mtrand\ {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftpack_lite", "..\fft\fft.vcxproj", "{8DF30923-9019-9A65-6D1F-5C5150DE3A95}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftpack_lite", "..\fft\fft.vcxproj", "{8048AE7F-FE06-80A6-4504-372CCB3E7D5F}" ProjectSection(ProjectDependencies) = postProject {9D8FA516-085C-40B2-93CA-F3A419B2FCED} = {9D8FA516-085C-40B2-93CA-F3A419B2FCED} {1B601FD0-B1EA-41DC-A899-07093F298467} = {1B601FD0-B1EA-41DC-A899-07093F298467} {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lapack_lite", "..\linalg\lapack_lite.vcxproj", "{EEA56426-3F11-64DA-6DB8-4B435147CFA0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lapack_lite", "..\linalg\lapack_lite.vcxproj", "{0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}" ProjectSection(ProjectDependencies) = postProject {9D8FA516-085C-40B2-93CA-F3A419B2FCED} = {9D8FA516-085C-40B2-93CA-F3A419B2FCED} {1B601FD0-B1EA-41DC-A899-07093F298467} = {1B601FD0-B1EA-41DC-A899-07093F298467} @@ -37,90 +37,46 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lapack_lite", "..\linalg\la EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Install|Any CPU = Debug_Install|Any CPU - Debug_Install|Mixed Platforms = Debug_Install|Mixed Platforms - Debug_Install|Win32 = Debug_Install|Win32 - Debug_Install|x64 = Debug_Install|x64 Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release_Install|Any CPU = Release_Install|Any CPU - Release_Install|Mixed Platforms = Release_Install|Mixed Platforms - Release_Install|Win32 = Release_Install|Win32 - Release_Install|x64 = Release_Install|x64 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|Any CPU.ActiveCfg = Debug_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|Any CPU.Build.0 = Debug_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|Mixed Platforms.ActiveCfg = Debug_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|Mixed Platforms.Build.0 = Debug_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|Win32.ActiveCfg = Debug_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug_Install|x64.ActiveCfg = Debug_Install|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|Win32.ActiveCfg = Debug|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|Any CPU.ActiveCfg = Release_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|Any CPU.Build.0 = Release_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|Mixed Platforms.ActiveCfg = Release_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|Mixed Platforms.Build.0 = Release_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|Win32.ActiveCfg = Release_Install|Any CPU - {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release_Install|x64.ActiveCfg = Release_Install|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|Any CPU.Build.0 = Release|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|Win32.ActiveCfg = Release|Any CPU {9D8FA516-085C-40B2-93CA-F3A419B2FCED}.Release|x64.ActiveCfg = Release|Any CPU - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|Any CPU.ActiveCfg = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|Mixed Platforms.ActiveCfg = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|Mixed Platforms.Build.0 = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|Win32.ActiveCfg = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|Win32.Build.0 = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug_Install|x64.ActiveCfg = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|Win32.ActiveCfg = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|Win32.Build.0 = Debug|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Debug|x64.ActiveCfg = Debug|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|Any CPU.ActiveCfg = Release|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|Mixed Platforms.ActiveCfg = Release|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|Mixed Platforms.Build.0 = Release|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|Win32.ActiveCfg = Release|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|Win32.Build.0 = Release|Win32 - {1B601FD0-B1EA-41DC-A899-07093F298467}.Release_Install|x64.ActiveCfg = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|Any CPU.ActiveCfg = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|Mixed Platforms.Build.0 = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|Win32.ActiveCfg = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|Win32.Build.0 = Release|Win32 {1B601FD0-B1EA-41DC-A899-07093F298467}.Release|x64.ActiveCfg = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|Any CPU.ActiveCfg = Debug|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|Mixed Platforms.ActiveCfg = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|Mixed Platforms.Build.0 = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|Win32.ActiveCfg = Debug|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|x64.ActiveCfg = Debug|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug_Install|x64.Build.0 = Debug|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|Any CPU.ActiveCfg = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|Win32.ActiveCfg = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|x64.ActiveCfg = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Debug|x64.Build.0 = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|Any CPU.ActiveCfg = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|Mixed Platforms.ActiveCfg = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|Mixed Platforms.Build.0 = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|Win32.ActiveCfg = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|x64.ActiveCfg = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release_Install|x64.Build.0 = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|Any CPU.ActiveCfg = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|Mixed Platforms.Build.0 = Release|Win32 @@ -128,78 +84,42 @@ Global {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|Win32.Build.0 = Release|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|x64.ActiveCfg = Release|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2756CDEA26}.Release|x64.Build.0 = Release|x64 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|Any CPU.ActiveCfg = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|Mixed Platforms.ActiveCfg = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|Mixed Platforms.Build.0 = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|Win32.ActiveCfg = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|Win32.Build.0 = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug_Install|x64.ActiveCfg = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|Win32.ActiveCfg = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|Win32.Build.0 = Debug|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Debug|x64.ActiveCfg = Debug|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|Any CPU.ActiveCfg = Release|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|Mixed Platforms.ActiveCfg = Release|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|Mixed Platforms.Build.0 = Release|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|Win32.ActiveCfg = Release|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|Win32.Build.0 = Release|Win32 - {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release_Install|x64.ActiveCfg = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|Any CPU.ActiveCfg = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|Mixed Platforms.Build.0 = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|Win32.ActiveCfg = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|Win32.Build.0 = Release|Win32 {B5C0DD2F-2814-4A09-B3AC-96782C38C6EC}.Release|x64.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|Any CPU.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|Mixed Platforms.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|Mixed Platforms.Build.0 = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|Win32.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|Win32.Build.0 = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug_Install|x64.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|Win32.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|Win32.Build.0 = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Debug|x64.ActiveCfg = Debug|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|Any CPU.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|Mixed Platforms.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|Mixed Platforms.Build.0 = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|Win32.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|Win32.Build.0 = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release_Install|x64.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|Any CPU.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|Mixed Platforms.Build.0 = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|Win32.ActiveCfg = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|Win32.Build.0 = Release|Win32 - {8DF30923-9019-9A65-6D1F-5C5150DE3A95}.Release|x64.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|Any CPU.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|Mixed Platforms.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|Mixed Platforms.Build.0 = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|Win32.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|Win32.Build.0 = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug_Install|x64.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|Win32.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|Win32.Build.0 = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Debug|x64.ActiveCfg = Debug|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|Any CPU.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|Mixed Platforms.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|Mixed Platforms.Build.0 = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|Win32.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|Win32.Build.0 = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release_Install|x64.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|Any CPU.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|Mixed Platforms.Build.0 = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|Win32.ActiveCfg = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|Win32.Build.0 = Release|Win32 - {EEA56426-3F11-64DA-6DB8-4B435147CFA0}.Release|x64.ActiveCfg = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|Win32.Build.0 = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Debug|x64.ActiveCfg = Debug|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|Any CPU.ActiveCfg = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|Mixed Platforms.Build.0 = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|Win32.ActiveCfg = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|Win32.Build.0 = Release|Win32 + {8048AE7F-FE06-80A6-4504-372CCB3E7D5F}.Release|x64.ActiveCfg = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|Win32.Build.0 = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Debug|x64.ActiveCfg = Debug|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|Any CPU.ActiveCfg = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|Mixed Platforms.Build.0 = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|Win32.ActiveCfg = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|Win32.Build.0 = Release|Win32 + {0BFE2D51-BB88-6319-E3C5-35F6D203AFCD}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/numpy/fft/fft.vcxproj b/numpy/fft/fft.vcxproj index 236c75da9..9bcdd6ad0 100644 --- a/numpy/fft/fft.vcxproj +++ b/numpy/fft/fft.vcxproj @@ -60,7 +60,7 @@ true Windows kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ndarray.lib;%(AdditionalDependencies) - $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug;%(AdditionalLibraryDirectories) + $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin;%(AdditionalLibraryDirectories) false @@ -84,7 +84,7 @@ true true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ndarray.lib;%(AdditionalDependencies) - $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug;%(AdditionalLibraryDirectories) + $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin;%(AdditionalLibraryDirectories) @@ -100,9 +100,6 @@ - - ..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug\NumpyDotNet.dll - @@ -123,6 +120,11 @@ + + + {9d8fa516-085c-40b2-93ca-f3a419b2fced} + + diff --git a/numpy/linalg/lapack_lite.vcxproj b/numpy/linalg/lapack_lite.vcxproj index bc5f1fb8d..760800eea 100644 --- a/numpy/linalg/lapack_lite.vcxproj +++ b/numpy/linalg/lapack_lite.vcxproj @@ -85,7 +85,7 @@ true true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ndarray.lib;%(AdditionalDependencies) - $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug;%(AdditionalLibraryDirectories) + $(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin;%(AdditionalLibraryDirectories) @@ -100,9 +100,6 @@ - - ..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug\NumpyDotNet.dll - @@ -137,6 +134,11 @@ false + + + {9d8fa516-085c-40b2-93ca-f3a419b2fced} + + diff --git a/numpy/random/mtrand/mtrand.vcxproj b/numpy/random/mtrand/mtrand.vcxproj index df6920f88..c1dd3f7a3 100755 --- a/numpy/random/mtrand/mtrand.vcxproj +++ b/numpy/random/mtrand/mtrand.vcxproj @@ -41,11 +41,11 @@ true - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\ false - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\ @@ -58,8 +58,8 @@ true - $(SolutionDir)\bin\debug\ndarray.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\$(TargetName)$(TargetExt) + $(SolutionDir)\bin\ndarray.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(TargetName)$(TargetExt) @@ -72,8 +72,8 @@ true - $(SolutionDir)\bin\debug\ndarray.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\$(TargetName)$(TargetExt) + $(SolutionDir)\bin\ndarray.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(TargetName)$(TargetExt)