From 0cc594bf211365061db83cea093aee9ef3abfa09 Mon Sep 17 00:00:00 2001
From: jofret
Date: Tue, 23 Mar 2010 12:45:07 +0000
Subject: Windows compilation

---
 .../src/c/matrixOperations/matrixOperations.vcproj | 30 ++-----------
 scilab2c/src/c/operations/operations.vcproj        | 52 +++++++++++++++++++++-
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/scilab2c/src/c/matrixOperations/matrixOperations.vcproj b/scilab2c/src/c/matrixOperations/matrixOperations.vcproj
index 2484a403..173f06f2 100644
--- a/scilab2c/src/c/matrixOperations/matrixOperations.vcproj
+++ b/scilab2c/src/c/matrixOperations/matrixOperations.vcproj
@@ -993,10 +993,10 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="hilbert"
+				Name="hilb"
 				>
 				<File
-					RelativePath=".\hilbert\dhilba.c"
+					RelativePath=".\hilb\dhilba.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1006,21 +1006,9 @@
 							CompileAs="2"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\hilbert\Makefile.am"
-					>
 				</File>
 				<File
-					RelativePath=".\hilbert\shilba.c"
+					RelativePath=".\hilb\shilba.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1030,14 +1018,6 @@
 							CompileAs="2"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
@@ -1547,10 +1527,6 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath=".\multiplication\Makefile.am"
-					>
-				</File>
 				<File
 					RelativePath=".\multiplication\smulma.c"
 					>
diff --git a/scilab2c/src/c/operations/operations.vcproj b/scilab2c/src/c/operations/operations.vcproj
index 50031299..a5464fdb 100644
--- a/scilab2c/src/c/operations/operations.vcproj
+++ b/scilab2c/src/c/operations/operations.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="lib /DEF:&quot;$(InputDir)auxiliaryFunctions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)auxiliaryFunctions.lib&quot; 1&gt;NUL 2&gt;NUL"
+				CommandLine="lib /DEF:&quot;$(InputDir)auxiliaryFunctions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)auxiliaryFunctions.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)matrixOperations_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)matrixOperations.lib&quot; 1&gt;NUL 2&gt;NUL"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="auxiliaryFunctions.lib"
+				AdditionalDependencies="auxiliaryFunctions.lib matrixOperations.lib"
 				OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -743,6 +743,18 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\multiplication\cmulv.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\multiplication\dmula.c"
 					>
@@ -783,6 +795,18 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\multiplication\dmulv.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\multiplication\smula.c"
 					>
@@ -823,6 +847,18 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\multiplication\smulv.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\multiplication\zmula.c"
 					>
@@ -875,6 +911,18 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\multiplication\zmulv.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							CompileAs="2"
+						/>
+					</FileConfiguration>
+				</File>
 				<File
 					RelativePath=".\multiplication\zmulzdv.c"
 					>
-- 
cgit