X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=otherlibs%2F_graphics%2Fsrc%2Fzlib%2Fzlib.dsp;fp=otherlibs%2F_graphics%2Fsrc%2Fzlib%2Fzlib.dsp;h=a20961d83237d38025f56fe8cfb1dbfc02f7cea7;hp=1d7640deae1f505a5717a4ecc3ceed58112f4764;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hpb=467a270adf12425827305759c0c4ea8f5b2b3854

diff --git a/otherlibs/_graphics/src/zlib/zlib.dsp b/otherlibs/_graphics/src/zlib/zlib.dsp
index 1d7640d..a20961d 100644
--- a/otherlibs/_graphics/src/zlib/zlib.dsp
+++ b/otherlibs/_graphics/src/zlib/zlib.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=zlib - Win32 Debug64 Itanium
+CFG=zlib - 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=zlib - 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 "zlib.mak" CFG="zlib - Win32 Debug64 Itanium"
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "zlib - Win32 Release64" (based on "Win32 (x86) Static Library")
-!MESSAGE "zlib - Win32 Debug64" (based on "Win32 (x86) Static Library")
-!MESSAGE "zlib - Win32 Release64 Itanium" (based on "Win32 (x86) Static Library")
-!MESSAGE "zlib - Win32 Debug64 Itanium" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "zlib - 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\zlib_Rls"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Rls"
+# PROP Output_Dir "..\..\..\..\_temp\zlib_Release"
+# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -51,7 +47,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\lib\zlib.lib"
 
@@ -64,8 +60,8 @@ LIB32=xilink6.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\_temp\zlib_Dbg"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Dbg"
+# PROP Output_Dir "..\..\..\..\_temp\zlib_Debug"
+# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
@@ -74,112 +70,16 @@ LIB32=xilink6.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\lib\zlibd.lib"
 
-!ELSEIF  "$(CFG)" == "zlib - Win32 Release64"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "zlib___Win32_Release64"
-# PROP BASE Intermediate_Dir "zlib___Win32_Release64"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\_temp\zlib_Rls64"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Rls64"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "WIN64" /D "EM64T" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\zlib.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\zlib_64.lib" /machine:AMD64
-
-!ELSEIF  "$(CFG)" == "zlib - Win32 Debug64"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "zlib___Win32_Debug64"
-# PROP BASE Intermediate_Dir "zlib___Win32_Debug64"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\_temp\zlib_Dbg64"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_Dbg64"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "WIN64" /D "EM64T" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\zlibd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\zlibd_64.lib" /machine:AMD64
-
-!ELSEIF  "$(CFG)" == "zlib - Win32 Release64 Itanium"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "zlib___Win32_Release64_Itanium"
-# PROP BASE Intermediate_Dir "zlib___Win32_Release64_Itanium"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\_temp\zlib_RlsI7"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_RlsI7"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\zlib_64.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\zlib_i7.lib" /machine:IA64
-
-!ELSEIF  "$(CFG)" == "zlib - Win32 Debug64 Itanium"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "zlib___Win32_Debug64_Itanium"
-# PROP BASE Intermediate_Dir "zlib___Win32_Debug64_Itanium"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\_temp\zlib_DbgI7"
-# PROP Intermediate_Dir "..\..\..\..\_temp\zlib_DbgI7"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /Qwd167 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\zlibd_64.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\zlibd_i7.lib" /machine:IA64
-
 !ENDIF 
 
 # Begin Target
 
 # Name "zlib - Win32 Release"
 # Name "zlib - Win32 Debug"
-# Name "zlib - Win32 Release64"
-# Name "zlib - Win32 Debug64"
-# Name "zlib - Win32 Release64 Itanium"
-# Name "zlib - Win32 Debug64 Itanium"
 # Begin Source File
 
 SOURCE=.\adler32.c