X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=otherlibs%2Fhighgui%2Fhighgui.dsp;h=97eef830ff3eb2d2cae35f6037a187d5bd0144a2;hp=a8280a99c209f4482483adfc7cb190e2b03cfe53;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hpb=467a270adf12425827305759c0c4ea8f5b2b3854;ds=sidebyside diff --git a/otherlibs/highgui/highgui.dsp b/otherlibs/highgui/highgui.dsp index a8280a9..97eef83 100644 --- a/otherlibs/highgui/highgui.dsp +++ b/otherlibs/highgui/highgui.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=highgui - Win32 Debug64 Itanium +CFG=highgui - 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=highgui - 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 "highgui.mak" CFG="highgui - Win32 Debug64 Itanium" +!MESSAGE NMAKE /f "highgui.mak" CFG="highgui - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "highgui - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "highgui - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "highgui - Win32 Release64" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "highgui - Win32 Debug64" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "highgui - Win32 Release64 Itanium" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "highgui - 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\HighGUI_Rls" -# PROP Intermediate_Dir "..\..\_temp\HighGUI_Rls" +# PROP Output_Dir "..\..\_temp\highgui_Release" +# PROP Intermediate_Dir "..\..\_temp\highgui_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" LIB32=link.exe -lib @@ -56,9 +52,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 /machine:I386 -# ADD LINK32 cxcore.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib libjpeg.lib libjasper.lib libpng.lib libtiff.lib zlib.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100.pdb" /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/highgui100.dll" /implib:"..\..\lib/highgui.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" +# ADD LINK32 cxcore.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100.pdb" /debug /machine:I386 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/highgui100.dll" /implib:"..\..\lib/highgui.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "highgui - Win32 Debug" @@ -70,8 +66,8 @@ LINK32=xilink6.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\_temp\HighGUI_Dbg" -# PROP Intermediate_Dir "..\..\_temp\HighGUI_Dbg" +# PROP Output_Dir "..\..\_temp\highgui_Debug" +# PROP Intermediate_Dir "..\..\_temp\highgui_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 /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 cxcored.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib libjpegd.lib libjasperd.lib libpngd.lib libtiffd.lib zlibd.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100d.pdb" /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/highgui100d.dll" /implib:"..\..\lib/highguid.lib" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\_graphics\lib" +# ADD LINK32 cxcored.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100d.pdb" /debug /machine:I386 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/highgui100d.dll" /implib:"..\..\lib/highguid.lib" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\_graphics\lib" # SUBTRACT LINK32 /pdb:none /nodefaultlib -!ELSEIF "$(CFG)" == "highgui - Win32 Release64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "highgui___Win32_Release64" -# PROP BASE Intermediate_Dir "highgui___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\highgui_Rls64" -# PROP Intermediate_Dir "..\..\_temp\highgui_Rls64" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /MD /W4 /Zi /O2 /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /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 cxcore.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/highgui100.dll" /implib:"..\..\lib/highgui.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:AMD64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 cxcore_64.lib zlib_64.lib libpng_64.lib libjpeg_64.lib libtiff_64.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/highgui100_64.dll" /implib:"..\..\lib/highgui_64.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "highgui - Win32 Debug64" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "highgui___Win32_Debug64" -# PROP BASE Intermediate_Dir "highgui___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\highgui_Dbg64" -# PROP Intermediate_Dir "..\..\_temp\highgui_Dbg64" -# 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 "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /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 cxcored.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/highgui100d.dll" /implib:"..\..\lib/highguid.lib" /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:AMD64 -# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib -# ADD LINK32 cxcored_64.lib zlibd_64.lib libpngd_64.lib libjpegd_64.lib libtiffd_64.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100d_64.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/highgui100d_64.dll" /implib:"..\..\lib/highguid_64.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:AMD64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "highgui - Win32 Release64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "highgui___Win32_Release64_Itanium" -# PROP BASE Intermediate_Dir "highgui___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\highgui_RlsI7" -# PROP Intermediate_Dir "..\..\_temp\highgui_RlsI7" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -LIB32=link.exe -lib -# ADD BASE CPP /nologo /MD /W4 /Zi /O2 /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /FR /Yu"_highgui.h" /FD /c -# ADD CPP /nologo /MD /w /W0 /Zi /O2 /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "NDEBUG" /D "WIN32" /D "WIN64" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /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 cxcore_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /debug /machine:IX86 /nodefaultlib:"libmmd.lib" /out:"..\..\bin/highgui100_i7.dll" /implib:"..\..\lib/highgui_i7.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 cxcore_i7.lib zlib_i7.lib libpng_i7.lib libjpeg_i7.lib libtiff_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /debug /machine:IX86 /out:"..\..\bin/highgui100_i7.dll" /implib:"..\..\lib/highgui_i7.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "highgui - Win32 Debug64 Itanium" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "highgui___Win32_Debug64_Itanium" -# PROP BASE Intermediate_Dir "highgui___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\highgui_DbgI7" -# PROP Intermediate_Dir "..\..\_temp\highgui_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 "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "EM64T" /FR /Yu"_highgui.h" /FD /Wp64 /c -# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "..\..\cxcore\include" /I "..\..\cv\include" /I ".\\" /I "..\_graphics\include" /D "_WINDOWS" /D "_MBCS" /D "CVAPI_EXPORTS" /D "_DEBUG" /D "WIN32" /D "WIN64" /D "HAVE_JPEG" /D "HAVE_PNG" /D "HAVE_TIFF" /FR /Yu"_highgui.h" /FD /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 cxcored_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100d_i7.pdb" /debug /machine:IX86 /nodefaultlib:"libmmdd.lib" /out:"..\..\bin/highgui100d_i7.dll" /implib:"..\..\lib/highguid_i7.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:IA64 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 cxcored_i7.lib zlibd_i7.lib libpngd_i7.lib libjpegd_i7.lib libtiffd_i7.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib comctl32.lib vfw32.lib /nologo /dll /pdb:"..\..\bin/highgui100d_i7.pdb" /debug /machine:IX86 /out:"..\..\bin/highgui100d_i7.dll" /implib:"..\..\lib/highguid_i7.lib" /libpath:"..\..\lib" /libpath:"..\_graphics\lib" /machine:IA64 -# SUBTRACT LINK32 /pdb:none - !ENDIF # Begin Target # Name "highgui - Win32 Release" # Name "highgui - Win32 Debug" -# Name "highgui - Win32 Release64" -# Name "highgui - Win32 Debug64" -# Name "highgui - Win32 Release64 Itanium" -# Name "highgui - Win32 Debug64 Itanium" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -323,6 +195,10 @@ SOURCE=.\cvcap_cmu.cpp # End Source File # Begin Source File +SOURCE=.\cvcap_images.cpp +# End Source File +# Begin Source File + SOURCE=.\cvcap_vfw.cpp # End Source File # Begin Source File @@ -362,20 +238,6 @@ SOURCE=.\window_w32.cpp # ADD CPP /Yu -!ELSEIF "$(CFG)" == "highgui - Win32 Release64" - -!ELSEIF "$(CFG)" == "highgui - Win32 Debug64" - -# ADD BASE CPP /Yu -# ADD CPP /Yu - -!ELSEIF "$(CFG)" == "highgui - Win32 Release64 Itanium" - -!ELSEIF "$(CFG)" == "highgui - Win32 Debug64 Itanium" - -# ADD BASE CPP /Yu -# ADD CPP /Yu - !ENDIF # End Source File