X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=ml%2Fsrc%2Fml.dsp;fp=ml%2Fsrc%2Fml.dsp;h=965c02325cedfbf11af46f89328528f8b6df8eff;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hp=2b5c06a3db933f3f6b8137d54b4344415fee01c9;hpb=467a270adf12425827305759c0c4ea8f5b2b3854;p=opencv

diff --git a/ml/src/ml.dsp b/ml/src/ml.dsp
index 2b5c06a..965c023 100644
--- a/ml/src/ml.dsp
+++ b/ml/src/ml.dsp
@@ -25,7 +25,7 @@ CFG=ml - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -38,8 +38,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\_temp\ml_Rls"
-# PROP Intermediate_Dir "..\..\_temp\ml_Rls"
+# PROP Output_Dir "..\..\_temp\ml_Release"
+# PROP Intermediate_Dir "..\..\_temp\ml_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 LIB32=link.exe -lib
@@ -52,7 +52,7 @@ LIB32=link.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 cxcore.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /pdb:"..\..\bin/ml100.pdb" /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/ml100.dll" /implib:"..\..\lib/ml.lib" /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none
@@ -66,13 +66,13 @@ LINK32=xilink6.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\_temp\ml_Dbg"
-# PROP Intermediate_Dir "..\..\_temp\ml_Dbg"
+# PROP Output_Dir "..\..\_temp\ml_Debug"
+# PROP Intermediate_Dir "..\..\_temp\ml_Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 LIB32=link.exe -lib
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ml_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "../include" /I "../../cxcore/include" /D "_DEBUG" /D "CVAPI_EXPORTS" /D "WIN32" /D "_WINDOWS" /FR /Yu"_ml.h" /FD /GZ /Zm200 /c
+# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "../include" /I "../../cxcore/include" /D "_DEBUG" /D "CVAPI_EXPORTS" /D "WIN32" /D "_WINDOWS" /FR /Yu"_ml.h" /FD /GZ /Zm200 /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -80,9 +80,9 @@ LIB32=link.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 cxcored.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /pdb:"..\..\bin/ml100d.pdb" /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/ml100d.dll" /implib:"..\..\lib/mld.lib" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 cxcored.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:"..\..\bin/ml100d.pdb" /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/ml100d.dll" /implib:"..\..\lib/mld.lib" /pdbtype:sept /libpath:"..\..\lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF