X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=cv%2Fsrc%2Fcv.dsp;fp=cv%2Fsrc%2Fcv.dsp;h=dee5d4c77e05435e724cad438a8c9465228d6c49;hp=028c8a007ea2aeaf1db9fecaff8eb71797251240;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hpb=467a270adf12425827305759c0c4ea8f5b2b3854 diff --git a/cv/src/cv.dsp b/cv/src/cv.dsp index 028c8a0..dee5d4c 100644 --- a/cv/src/cv.dsp +++ b/cv/src/cv.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=cv - Win32 Debug64 Itanium +CFG=cv - 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=cv - 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 "cv.mak" CFG="cv - Win32 Debug64 Itanium" +!MESSAGE NMAKE /f "cv.mak" CFG="cv - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "cv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "cv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cv - Win32 Release64" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cv - Win32 Debug64" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cv - Win32 Release64 Itanium" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cv - Win32 Debug64 Itanium" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=xicl6.exe +CPP=cl.exe MTL=midl.exe RSC=rc.exe @@ -42,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\_temp\CV_Rls" -# PROP Intermediate_Dir "..\..\_temp\CV_Rls" +# PROP Output_Dir "..\..\_temp\cv_Release" +# PROP Intermediate_Dir "..\..\_temp\cv_Release" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" LIB32=link.exe -lib @@ -56,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 /subsystem:windows /dll /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcore.lib /nologo /subsystem:windows /dll /pdb:"..\..\bin/cv100.pdb" /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\bin\cv100.dll" /implib:"../../lib/cv.lib" /libpath:"..\..\lib" # SUBTRACT LINK32 /profile /pdb:none /map @@ -70,8 +66,8 @@ LINK32=xilink6.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\_temp\CV_Dbg" -# PROP Intermediate_Dir "..\..\_temp\CV_Dbg" +# PROP Output_Dir "..\..\_temp\cv_Debug" +# PROP Intermediate_Dir "..\..\_temp\cv_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" LIB32=link.exe -lib @@ -84,141 +80,17 @@ 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcored.lib /nologo /subsystem:windows /dll /pdb:"..\..\bin/cv100d.pdb" /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin\cv100d.dll" /implib:"../../lib/cvd.lib" /libpath:"..\..\lib" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "cv - Win32 Release64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cv___Win32_Release64" -# PROP BASE Intermediate_Dir "cv___Win32_Release64" -# PROP BASE Ignore_Export_Lib 1 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\_temp\cv_Rls64" -# PROP Intermediate_Dir "..\..\_temp\cv_Rls64" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /G6 /MD /W4 /Zi /O2 /Ob2 /I "..\..\cxcore\include" /I "." /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "CVAPI_EXPORTS" /FR /Yu"_cv.h" /FD /Zm200 /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /Ob2 /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /FR /Yu"_cv.h" /FD /Zm200 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# 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 kernel32.lib user32.lib gdi32.lib cxcore.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin\cv100.dll" /implib:"../../lib/cv.lib" /libpath:"..\..\lib" /machine:AMD64 -# SUBTRACT BASE LINK32 /profile /map -# ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcore_64.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin\cv100_64.dll" /implib:"../../lib/cv_64.lib" /libpath:"..\..\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cv - Win32 Debug64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cv___Win32_Debug64" -# PROP BASE Intermediate_Dir "cv___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\cv_Dbg64" -# PROP Intermediate_Dir "..\..\_temp\cv_Dbg64" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /G6 /MDd /W4 /Gm /Zi /Od /I "..\..\cxcore\include" /I "." /I "..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "CVAPI_EXPORTS" /FR /Yu"_cv.h" /FD /GZ /Zm200 /c -# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /FR /Yu"_cv.h" /FD /Zm200 /Wp64 /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# 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 kernel32.lib user32.lib gdi32.lib cxcored.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin\cv100d.dll" /implib:"../../lib/cvd.lib" /libpath:"..\..\lib" /machine:AMD64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcored_64.lib /nologo /subsystem:windows /dll /pdb:"..\..\bin/cv100d_64.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin\cv100d_64.dll" /implib:"../../lib/cvd_64.lib" /libpath:"..\..\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cv - Win32 Release64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "cv___Win32_Release64_Itanium" -# PROP BASE Intermediate_Dir "cv___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\cv_RlsI7" -# PROP Intermediate_Dir "..\..\_temp\cv_RlsI7" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /MD /W4 /Zi /O2 /Ob2 /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /FR /Yu"_cv.h" /FD /Zm200 /c -# ADD CPP /nologo /MD /w /W0 /Zi /O2 /Ob2 /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /FR /Yu"_cv.h" /FD /Zm200 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# 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 kernel32.lib user32.lib gdi32.lib cxcore_i7.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin\cv100_i7.dll" /implib:"../../lib/cv_i7.lib" /libpath:"..\..\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcore_i7.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\bin\cv100_i7.dll" /implib:"../../lib/cv_i7.lib" /libpath:"..\..\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "cv - Win32 Debug64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cv___Win32_Debug64_Itanium" -# PROP BASE Intermediate_Dir "cv___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\cv_DbgI7" -# PROP Intermediate_Dir "..\..\_temp\cv_DbgI7" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /MDd /W4 /Gm /Zi /Od /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /FR /Yu"_cv.h" /FD /Zm200 /Wp64 /c -# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "..\..\cxcore\include" /I "." /I "..\include" /D "_WINDOWS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /FR /Yu"_cv.h" /FD /Zm200 /Qwd167 /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# 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 kernel32.lib user32.lib gdi32.lib cxcored_i7.lib /nologo /subsystem:windows /dll /pdb:"..\..\bin/cv100d_i7.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin\cv100d_i7.dll" /implib:"../../lib/cvd_i7.lib" /libpath:"..\..\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib cxcored_i7.lib /nologo /subsystem:windows /dll /pdb:"..\..\bin/cv100d_i7.pdb" /debug /machine:IX86 /out:"..\..\bin\cv100d_i7.dll" /implib:"../../lib/cvd_i7.lib" /libpath:"..\..\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - !ENDIF # Begin Target # Name "cv - Win32 Release" # Name "cv - Win32 Debug" -# Name "cv - Win32 Release64" -# Name "cv - Win32 Debug64" -# Name "cv - Win32 Release64 Itanium" -# Name "cv - Win32 Debug64 Itanium" # Begin Group "Src" # PROP Default_Filter "" @@ -463,6 +335,10 @@ SOURCE=.\cvaccum.cpp # End Source File # Begin Source File +SOURCE=.\cvkdtree.cpp +# End Source File +# Begin Source File + SOURCE=.\cvsumpixels.cpp # End Source File # Begin Source File @@ -532,6 +408,10 @@ SOURCE=.\_cvipp.h # End Source File # Begin Source File +SOURCE=.\_cvkdtree.hpp +# End Source File +# Begin Source File + SOURCE=.\_cvlist.h # End Source File # Begin Source File