X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=tests%2Fcv%2Fsrc%2Fcvtest.dsp;h=3c862a2841b8c924362581d35b28f84f301dc640;hp=31edad87e8238b34abcd57db272419d9ea64670f;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hpb=467a270adf12425827305759c0c4ea8f5b2b3854 diff --git a/tests/cv/src/cvtest.dsp b/tests/cv/src/cvtest.dsp index 31edad8..3c862a2 100644 --- a/tests/cv/src/cvtest.dsp +++ b/tests/cv/src/cvtest.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=cvtest - Win32 Debug64 Itanium +CFG=cvtest - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,23 +13,19 @@ CFG=cvtest - Win32 Debug64 Itanium !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "cvtest.mak" CFG="cvtest - Win32 Debug64 Itanium" +!MESSAGE NMAKE /f "cvtest.mak" CFG="cvtest - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "cvtest - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "cvtest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "cvtest - Win32 Release64" (based on "Win32 (x86) Console Application") -!MESSAGE "cvtest - Win32 Debug64" (based on "Win32 (x86) Console Application") -!MESSAGE "cvtest - Win32 Release64 Itanium" (based on "Win32 (x86) Console Application") -!MESSAGE "cvtest - Win32 Debug64 Itanium" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=xicl6.exe +CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "cvtest - Win32 Release" @@ -41,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\_temp\cvtest_Rls" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Rls" +# PROP Output_Dir "..\..\..\_temp\cvtest_Release" +# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe @@ -53,7 +49,7 @@ F90=df.exe 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 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 /subsystem:console /machine:I386 # ADD LINK32 cv.lib cvaux.lib cxcore.lib highgui.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib cxts.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\..\bin\cvtest.exe" /libpath:"..\..\..\lib" # SUBTRACT LINK32 /nodefaultlib @@ -67,8 +63,8 @@ LINK32=xilink6.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\_temp\cvtest_Dbg" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Dbg" +# PROP Output_Dir "..\..\..\_temp\cvtest_Debug" +# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe @@ -79,131 +75,16 @@ F90=df.exe 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 cvd.lib cvauxd.lib cxcored.lib highguid.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib cxtsd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\bin\cvtestd.exe" /pdbtype:sept /libpath:"..\..\..\lib" -!ELSEIF "$(CFG)" == "cvtest - Win32 Release64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cvtest___Win32_Release64" -# PROP BASE Intermediate_Dir "cvtest___Win32_Release64" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\_temp\cvtest_Rls64" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Rls64" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MD /W4 /GX /Zi /O2 /I "." /I "..\..\trs" /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"cvtest.h" /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "." /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "WIN64" /D "EM64T" /Yu"cvtest.h" /FD /c -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 cv.lib cvaux.lib cxcore.lib highgui.lib trs.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib cxts.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\..\bin\cvtest.exe" /libpath:"..\..\..\lib" -# SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 cv_64.lib cvaux_64.lib cxcore_64.lib highgui_64.lib cxts_64.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtest_64.pdb" /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\bin\cvtest_64.exe" /libpath:"..\..\..\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cvtest - Win32 Debug64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cvtest___Win32_Debug64" -# PROP BASE Intermediate_Dir "cvtest___Win32_Debug64" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\_temp\cvtest_Dbg64" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_Dbg64" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "." /I "..\..\trs" /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"cvtest.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "." /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "WIN64" /D "EM64T" /Yu"cvtest.h" /FD /Wp64 /c -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 cvd.lib cvauxd.lib cxcored.lib highguid.lib trsd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib cxtsd.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\bin\cvtestd.exe" /pdbtype:sept /libpath:"..\..\..\lib" -# ADD LINK32 cvd_64.lib cvauxd_64.lib cxcored_64.lib highguid_64.lib cxtsd_64.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtestd_64.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\bin\cvtestd_64.exe" /libpath:"..\..\..\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cvtest - Win32 Release64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cvtest___Win32_Release64_Itanium" -# PROP BASE Intermediate_Dir "cvtest___Win32_Release64_Itanium" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\_temp\cvtest_RlsI7" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_RlsI7" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MD /W4 /GX /Zi /O2 /I "." /I "..\..\trs" /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "WIN64" /D "EM64T" /Yu"cvtest.h" /FD /c -# ADD CPP /nologo /MD /w /W0 /GX /Zi /O2 /I "." /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "WIN32" /D "WIN64" /Yu"cvtest.h" /FD /c -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 cv_i7.lib cvaux_i7.lib cxcore_i7.lib highgui_i7.lib trs_i7.lib cxts_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtest_i7.pdb" /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\..\bin\cvtest_i7.exe" /libpath:"..\..\..\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 cv_i7.lib cvaux_i7.lib cxcore_i7.lib highgui_i7.lib cxts_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtest_i7.pdb" /debug /machine:IX86 /out:"..\..\..\bin\cvtest_i7.exe" /libpath:"..\..\..\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cvtest - Win32 Debug64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cvtest___Win32_Debug64_Itanium" -# PROP BASE Intermediate_Dir "cvtest___Win32_Debug64_Itanium" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\_temp\cvtest_DbgI7" -# PROP Intermediate_Dir "..\..\..\_temp\cvtest_DbgI7" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "." /I "..\..\trs" /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "WIN64" /D "EM64T" /Yu"cvtest.h" /FD /Wp64 /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\..\cxts" /I "..\..\..\cxcore\include" /I "..\..\..\cv\include" /I "..\..\..\cvaux\include" /I "..\..\..\otherlibs\highgui" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "WIN64" /Yu"cvtest.h" /FD /Qwd167 /c -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=xilink6.exe -# ADD BASE LINK32 cvd_i7.lib cvauxd_i7.lib cxcored_i7.lib highguid_i7.lib trsd_i7.lib cxtsd_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtestd_i7.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\..\bin\cvtestd_i7.exe" /libpath:"..\..\..\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 cvd_i7.lib cvauxd_i7.lib cxcored_i7.lib highguid_i7.lib cxtsd_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /pdb:"..\..\..\bin/cvtestd_i7.pdb" /debug /machine:IX86 /out:"..\..\..\bin\cvtestd_i7.exe" /libpath:"..\..\..\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - !ENDIF # Begin Target # Name "cvtest - Win32 Release" # Name "cvtest - Win32 Debug" -# Name "cvtest - Win32 Release64" -# Name "cvtest - Win32 Debug64" -# Name "cvtest - Win32 Release64 Itanium" -# Name "cvtest - Win32 Debug64 Itanium" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"