From: Rolf K. <lab...@us...> - 2007-12-06 14:18:06
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15758 Modified Files: zlibvc.dsp Log Message: Added compile definition to avoid use of vsnprintf and project with use of static C runtime library Index: zlibvc.dsp =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** zlibvc.dsp 17 Sep 2007 16:13:02 -0000 1.11 --- zlibvc.dsp 6 Dec 2007 14:18:00 -0000 1.12 *************** *** 23,26 **** --- 23,28 ---- !MESSAGE "zlibvc - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlibvc - Win32 DLL ASM Obj Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlibvc - Win32 static ASM Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlibvc - Win32 static Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 47,52 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 49,54 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 59,63 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" --- 61,65 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" *************** *** 75,80 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c ! # ADD CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 77,82 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 87,91 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" --- 89,93 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" *************** *** 103,114 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 105,116 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 116,120 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" --- 118,122 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" *************** *** 132,138 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 134,140 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 145,149 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no --- 147,151 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no *************** *** 162,168 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 164,170 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 175,179 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib gvmat32.obj inffas32.obj /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Obj_Release\lvzlib.dll" !ENDIF --- 177,240 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 gvmat32.obj inffas32.obj user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Obj_Release\lvzlib.dll" ! ! !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP BASE Intermediate_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP BASE Ignore_Export_Lib 1 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP Intermediate_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP Ignore_Export_Lib 1 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c ! # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" ! # ADD LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_static_ASM_Release\lvzlib.dll" ! ! !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "zlibvc___Win32_static_Release" ! # PROP BASE Intermediate_Dir "zlibvc___Win32_static_Release" ! # PROP BASE Ignore_Export_Lib 1 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "zlibvc___Win32_static_Release" ! # PROP Intermediate_Dir "zlibvc___Win32_static_Release" ! # PROP Ignore_Export_Lib 1 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /fo"zlibvc___Win32_DLL_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_static_Release\lvzlib.dll" ! # SUBTRACT LINK32 /nodefaultlib !ENDIF *************** *** 186,189 **** --- 247,252 ---- # Name "zlibvc - Win32 DLL ASM Debug" # Name "zlibvc - Win32 DLL ASM Obj Release" + # Name "zlibvc - Win32 static ASM Release" + # Name "zlibvc - Win32 static Release" # Begin Group "Source Files" *************** *** 205,208 **** --- 268,278 ---- !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release" + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # SUBTRACT BASE CPP /YX /Yc /Yu + # SUBTRACT CPP /YX /Yc /Yu + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + !ENDIF *************** *** 259,263 **** --- 329,365 ---- SOURCE=.\MacBinaryIII.c + + !IF "$(CFG)" == "zlibvc - Win32 DLL Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 + + !ENDIF + # End Source File # Begin Source File *************** *** 425,428 **** --- 527,547 ---- # PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\zlibvc___Win32_static_ASM_Release + InputPath=.\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF *************** *** 452,455 **** --- 571,581 ---- # PROP BASE Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF *************** *** 495,498 **** --- 621,641 ---- # PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\zlibvc___Win32_static_ASM_Release + InputPath=.\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF |