From bc0b285a23b56f440a7c2705a46cbc5b97726a22 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 20 Mar 2011 11:15:14 +0000 Subject: [PATCH] Updated ide/VisualC6 project files with changed zlib files. Deleted obsolete (renamed) zlib.dsp and zlibdll.dsp files. Added *.ilk to svn:ignore on fluid directory. Tested with VisualC2008: builds w/o errors in Release and Debug mode. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8519 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- ide/VisualC6/fltk_zlib.dsp | 25 ++++--- ide/VisualC6/fltk_zlibdll.dsp | 89 ++++------------------ ide/VisualC6/zlib.dsp | 129 -------------------------------- ide/VisualC6/zlibdll.dsp | 137 ---------------------------------- 4 files changed, 26 insertions(+), 354 deletions(-) delete mode 100644 ide/VisualC6/zlib.dsp delete mode 100644 ide/VisualC6/zlibdll.dsp diff --git a/ide/VisualC6/fltk_zlib.dsp b/ide/VisualC6/fltk_zlib.dsp index 4ea6b3fcb..ade64c831 100644 --- a/ide/VisualC6/fltk_zlib.dsp +++ b/ide/VisualC6/fltk_zlib.dsp @@ -82,47 +82,48 @@ LIB32=link.exe -lib # Name "fltk_zlib - Win32 Release" # Name "fltk_zlib - Win32 Debug" # Begin Source File - SOURCE=..\..\zlib\adler32.c # End Source File # Begin Source File - SOURCE=..\..\zlib\compress.c # End Source File # Begin Source File - SOURCE=..\..\zlib\crc32.c # End Source File # Begin Source File - SOURCE=..\..\zlib\deflate.c # End Source File # Begin Source File - -SOURCE=..\..\zlib\gzio.c +SOURCE=..\..\zlib\gzclose.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzlib.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzread.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzwrite.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\infback.c # End Source File # Begin Source File - SOURCE=..\..\zlib\inffast.c # End Source File # Begin Source File - SOURCE=..\..\zlib\inflate.c # End Source File # Begin Source File - SOURCE=..\..\zlib\inftrees.c # End Source File # Begin Source File - SOURCE=..\..\zlib\trees.c # End Source File # Begin Source File - SOURCE=..\..\zlib\uncompr.c # End Source File # Begin Source File - SOURCE=..\..\zlib\zutil.c # End Source File # End Target diff --git a/ide/VisualC6/fltk_zlibdll.dsp b/ide/VisualC6/fltk_zlibdll.dsp index 6685f9e46..eaed5853d 100644 --- a/ide/VisualC6/fltk_zlibdll.dsp +++ b/ide/VisualC6/fltk_zlibdll.dsp @@ -90,112 +90,49 @@ LINK32=link.exe # Name "fltk_zlibdll - Win32 Release" # Name "fltk_zlibdll - Win32 Debug" # Begin Source File - SOURCE=..\..\zlib\adler32.c -DEP_CPP_ADLER=\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\compress.c -DEP_CPP_COMPR=\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\crc32.c -DEP_CPP_CRC32=\ - "..\..\zlib\crc32.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\deflate.c -DEP_CPP_DEFLA=\ - "..\..\zlib\deflate.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - -SOURCE=..\..\zlib\gzio.c -DEP_CPP_GZIO_=\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - +SOURCE=..\..\zlib\gzclose.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzlib.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzread.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\gzwrite.c +# End Source File +# Begin Source File +SOURCE=..\..\zlib\infback.c # End Source File # Begin Source File - SOURCE=..\..\zlib\inffast.c -DEP_CPP_INFFA=\ - "..\..\zlib\inffast.h"\ - "..\..\zlib\inflate.h"\ - "..\..\zlib\inftrees.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\inflate.c -DEP_CPP_INFLA=\ - "..\..\zlib\inffast.h"\ - "..\..\zlib\inffixed.h"\ - "..\..\zlib\inflate.h"\ - "..\..\zlib\inftrees.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\inftrees.c -DEP_CPP_INFTR=\ - "..\..\zlib\inftrees.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\trees.c -DEP_CPP_TREES=\ - "..\..\zlib\deflate.h"\ - "..\..\zlib\trees.h"\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\uncompr.c -DEP_CPP_UNCOM=\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - # End Source File # Begin Source File - SOURCE=..\..\zlib\zutil.c -DEP_CPP_ZUTIL=\ - "..\..\zlib\zconf.h"\ - "..\..\zlib\zlib.h"\ - "..\..\zlib\zutil.h"\ - # End Source File # End Target # End Project diff --git a/ide/VisualC6/zlib.dsp b/ide/VisualC6/zlib.dsp deleted file mode 100644 index b5527e059..000000000 --- a/ide/VisualC6/zlib.dsp +++ /dev/null @@ -1,129 +0,0 @@ -# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=zlib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "zlib.mak". -!MESSAGE -!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 Debug" -!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 - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "zlib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c -# SUBTRACT CPP /Os -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\zlib.lib" - -!ELSEIF "$(CFG)" == "zlib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "../.." /I "../../zlib" /I "../../png" /I "../../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\zlibd.lib" - -!ENDIF - -# Begin Target - -# Name "zlib - Win32 Release" -# Name "zlib - Win32 Debug" -# Begin Source File - -SOURCE=..\..\zlib\adler32.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\compress.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\crc32.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\deflate.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\gzio.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inffast.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inflate.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inftrees.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\trees.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\uncompr.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\zutil.c -# End Source File -# End Target -# End Project diff --git a/ide/VisualC6/zlibdll.dsp b/ide/VisualC6/zlibdll.dsp deleted file mode 100644 index 175692d4e..000000000 --- a/ide/VisualC6/zlibdll.dsp +++ /dev/null @@ -1,137 +0,0 @@ -# Microsoft Developer Studio Project File - Name="zlibdll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=zlibdll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "zlibdll.mak". -!MESSAGE -!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 "zlibdll.mak" CFG="zlibdll - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "zlibdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "zlibdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "zlibdll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "zlibdll0" -# PROP BASE Intermediate_Dir "zlibdll0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "../../test" -# PROP Intermediate_Dir "zlibdll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I "../../zlib" /I "../../png" /I "../../jpeg" /I "." /I "../.." /D "FL_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -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 /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"zlibdll.pdb" /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "zlibdll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "zlibdll1" -# PROP BASE Intermediate_Dir "zlibdll1" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "../../test" -# PROP Intermediate_Dir "zlibdlld" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /GX /ZI /Od /I "." /I "../.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"zlibdlld.pdb" /debug /machine:I386 /out:"../../test/zlibdlld.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none /incremental:no - -!ENDIF - -# Begin Target - -# Name "zlibdll - Win32 Release" -# Name "zlibdll - Win32 Debug" -# Begin Source File - -SOURCE=..\..\zlib\adler32.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\compress.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\crc32.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\deflate.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\gzio.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inffast.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inflate.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\inftrees.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\trees.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\uncompr.c -# End Source File -# Begin Source File - -SOURCE=..\..\zlib\zutil.c -# End Source File -# End Target -# End Project