summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-05-25 13:38:05 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-05-25 13:38:05 +0200
commitc8450cc3137e484fbcaab512bef302099c97045f (patch)
tree07139c0456b1beae7559ac96fcc1661fd28c1e3a
parent79894606fbeaf0b8b4eb6822ff6ceb930c57dbcb (diff)
downloadscilab-c8450cc3137e484fbcaab512bef302099c97045f.zip
scilab-c8450cc3137e484fbcaab512bef302099c97045f.tar.gz
fix build windows (wrong library name, release x64)cdftest
Change-Id: I67cdf21a151bed4c81ab6d637afc0227dedb8e9c
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj30
1 files changed, 21 insertions, 9 deletions
diff --git a/scilab/modules/xpad/src/c/xpad.vcproj b/scilab/modules/xpad/src/c/xpad.vcproj
index 2472e64..be75d5a 100644
--- a/scilab/modules/xpad/src/c/xpad.vcproj
+++ b/scilab/modules/xpad/src/c/xpad.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -36,6 +36,9 @@
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38 <Tool 38 <Tool
39 Name="VCWebServiceProxyGeneratorTool"
40 />
41 <Tool
39 Name="VCMIDLTool" 42 Name="VCMIDLTool"
40 /> 43 />
41 <Tool 44 <Tool
@@ -65,14 +68,14 @@
65 <Tool 68 <Tool
66 Name="VCLinkerTool" 69 Name="VCLinkerTool"
67 AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib" 70 AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib"
68 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 71 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
69 LinkIncremental="1" 72 LinkIncremental="1"
70 ModuleDefinitionFile="" 73 ModuleDefinitionFile=""
71 GenerateDebugInformation="true" 74 GenerateDebugInformation="true"
72 SubSystem="2" 75 SubSystem="2"
73 RandomizedBaseAddress="1" 76 RandomizedBaseAddress="1"
74 DataExecutionPrevention="0" 77 DataExecutionPrevention="0"
75 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" 78 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
76 TargetMachine="1" 79 TargetMachine="1"
77 CLRUnmanagedCodeCheck="true" 80 CLRUnmanagedCodeCheck="true"
78 /> 81 />
@@ -115,6 +118,9 @@
115 Name="VCXMLDataGeneratorTool" 118 Name="VCXMLDataGeneratorTool"
116 /> 119 />
117 <Tool 120 <Tool
121 Name="VCWebServiceProxyGeneratorTool"
122 />
123 <Tool
118 Name="VCMIDLTool" 124 Name="VCMIDLTool"
119 TargetEnvironment="3" 125 TargetEnvironment="3"
120 /> 126 />
@@ -144,14 +150,14 @@
144 <Tool 150 <Tool
145 Name="VCLinkerTool" 151 Name="VCLinkerTool"
146 AdditionalDependencies="libscilab.lib" 152 AdditionalDependencies="libscilab.lib"
147 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 153 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
148 LinkIncremental="1" 154 LinkIncremental="1"
149 ModuleDefinitionFile="" 155 ModuleDefinitionFile=""
150 GenerateDebugInformation="true" 156 GenerateDebugInformation="true"
151 SubSystem="2" 157 SubSystem="2"
152 RandomizedBaseAddress="1" 158 RandomizedBaseAddress="1"
153 DataExecutionPrevention="0" 159 DataExecutionPrevention="0"
154 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" 160 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
155 TargetMachine="17" 161 TargetMachine="17"
156 CLRUnmanagedCodeCheck="true" 162 CLRUnmanagedCodeCheck="true"
157 /> 163 />
@@ -195,6 +201,9 @@
195 Name="VCXMLDataGeneratorTool" 201 Name="VCXMLDataGeneratorTool"
196 /> 202 />
197 <Tool 203 <Tool
204 Name="VCWebServiceProxyGeneratorTool"
205 />
206 <Tool
198 Name="VCMIDLTool" 207 Name="VCMIDLTool"
199 /> 208 />
200 <Tool 209 <Tool
@@ -226,7 +235,7 @@
226 <Tool 235 <Tool
227 Name="VCLinkerTool" 236 Name="VCLinkerTool"
228 AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib" 237 AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib"
229 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 238 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
230 LinkIncremental="1" 239 LinkIncremental="1"
231 ModuleDefinitionFile="" 240 ModuleDefinitionFile=""
232 GenerateDebugInformation="false" 241 GenerateDebugInformation="false"
@@ -236,7 +245,7 @@
236 LinkTimeCodeGeneration="0" 245 LinkTimeCodeGeneration="0"
237 RandomizedBaseAddress="1" 246 RandomizedBaseAddress="1"
238 DataExecutionPrevention="0" 247 DataExecutionPrevention="0"
239 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" 248 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
240 TargetMachine="1" 249 TargetMachine="1"
241 CLRUnmanagedCodeCheck="true" 250 CLRUnmanagedCodeCheck="true"
242 /> 251 />
@@ -280,6 +289,9 @@
280 Name="VCXMLDataGeneratorTool" 289 Name="VCXMLDataGeneratorTool"
281 /> 290 />
282 <Tool 291 <Tool
292 Name="VCWebServiceProxyGeneratorTool"
293 />
294 <Tool
283 Name="VCMIDLTool" 295 Name="VCMIDLTool"
284 TargetEnvironment="3" 296 TargetEnvironment="3"
285 /> 297 />
@@ -311,7 +323,7 @@
311 <Tool 323 <Tool
312 Name="VCLinkerTool" 324 Name="VCLinkerTool"
313 AdditionalDependencies="libscilab.lib" 325 AdditionalDependencies="libscilab.lib"
314 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 326 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
315 LinkIncremental="1" 327 LinkIncremental="1"
316 ModuleDefinitionFile="" 328 ModuleDefinitionFile=""
317 GenerateDebugInformation="false" 329 GenerateDebugInformation="false"
@@ -321,7 +333,7 @@
321 LinkTimeCodeGeneration="0" 333 LinkTimeCodeGeneration="0"
322 RandomizedBaseAddress="1" 334 RandomizedBaseAddress="1"
323 DataExecutionPrevention="0" 335 DataExecutionPrevention="0"
324 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" 336 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
325 TargetMachine="17" 337 TargetMachine="17"
326 CLRUnmanagedCodeCheck="true" 338 CLRUnmanagedCodeCheck="true"
327 /> 339 />