From 989befded33ed804c0e84bb469141e1dc41c957d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 8 May 2001 22:28:06 +0000 Subject: [PATCH] removed MSVC libxpm makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xpm/XpmVC.dsp | 186 -------------------------------------------- src/xpm/XpmVC.dsw | 29 ------- src/xpm/makefile.vc | 166 --------------------------------------- src/xpm/xpm.dsp | 186 -------------------------------------------- 4 files changed, 567 deletions(-) delete mode 100644 src/xpm/XpmVC.dsp delete mode 100644 src/xpm/XpmVC.dsw delete mode 100644 src/xpm/makefile.vc delete mode 100644 src/xpm/xpm.dsp diff --git a/src/xpm/XpmVC.dsp b/src/xpm/XpmVC.dsp deleted file mode 100644 index 3cd176618c..0000000000 --- a/src/xpm/XpmVC.dsp +++ /dev/null @@ -1,186 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xpm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=xpm - 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 "xpm.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 "xpm.mak" CFG="xpm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xpm - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "xpm - 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)" == "xpm - 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 "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\xpm.lib" - -!ELSEIF "$(CFG)" == "xpm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "xpm___Win32_Debug" -# PROP BASE Intermediate_Dir "xpm___Win32_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 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\xpmd.lib" - -!ENDIF - -# Begin Target - -# Name "xpm - Win32 Release" -# Name "xpm - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\attrib.c -# End Source File -# Begin Source File - -SOURCE=.\crbuffri.c -# End Source File -# Begin Source File - -SOURCE=.\crdatfri.c -# End Source File -# Begin Source File - -SOURCE=.\create.c -# End Source File -# Begin Source File - -SOURCE=.\crifrbuf.c -# End Source File -# Begin Source File - -SOURCE=.\crifrdat.c -# End Source File -# Begin Source File - -SOURCE=.\dataxpm.c -# End Source File -# Begin Source File - -SOURCE=.\hashtab.c -# End Source File -# Begin Source File - -SOURCE=.\imagexpm.c -# End Source File -# Begin Source File - -SOURCE=.\info.c -# End Source File -# Begin Source File - -SOURCE=.\misc.c -# End Source File -# Begin Source File - -SOURCE=.\parse.c -# End Source File -# Begin Source File - -SOURCE=.\rdftodat.c -# End Source File -# Begin Source File - -SOURCE=.\rdftoi.c -# End Source File -# Begin Source File - -SOURCE=.\rgb.c -# End Source File -# Begin Source File - -SOURCE=.\scan.c -# End Source File -# Begin Source File - -SOURCE=.\simx.c -# End Source File -# Begin Source File - -SOURCE=.\wrffrdat.c -# End Source File -# Begin Source File - -SOURCE=.\wrffri.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\rgbtab.h -# End Source File -# Begin Source File - -SOURCE=.\simx.h -# End Source File -# Begin Source File - -SOURCE=.\xpm.h -# End Source File -# Begin Source File - -SOURCE=.\xpmi.h -# End Source File -# End Group -# End Target -# End Project diff --git a/src/xpm/XpmVC.dsw b/src/xpm/XpmVC.dsw deleted file mode 100644 index 270daf62c1..0000000000 --- a/src/xpm/XpmVC.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "xpm"=.\XpmVC.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/xpm/makefile.vc b/src/xpm/makefile.vc deleted file mode 100644 index 9566c36dc8..0000000000 --- a/src/xpm/makefile.vc +++ /dev/null @@ -1,166 +0,0 @@ -# -# File: makefile.vc -# Author: Julian Smart -# Created: 1997 -# Updated: -# Copyright: (c) 1997, Julian Smart -# -# "%W% %G%" -# -# Makefile : Builds xpm.lib for VC++ (32-bit) -# -!include <..\makevc.env> - -!if "$(RM)" == "" -RM= del -!endif - -THISDIR=$(WXWIN)\src\xpm - -!if "$(FINAL)" == "1" -LIBTARGET=$(WXDIR)\lib\xpm.lib -!else if "$(FINAL)" == "hybrid" -LIBTARGET=$(WXDIR)\lib\xpmh.lib -!else -LIBTARGET=$(WXDIR)\lib\xpmd.lib -!endif - -XPMDIR=$(WXDIR)\src\xpm - -OBJECTS = $(XPMDIR)\$D\attrib.obj\ - $(XPMDIR)\$D\crbuffri.obj\ - $(XPMDIR)\$D\crdatfri.obj\ - $(XPMDIR)\$D\create.obj\ - $(XPMDIR)\$D\crifrbuf.obj\ - $(XPMDIR)\$D\crifrdat.obj\ - $(XPMDIR)\$D\data.obj\ - $(XPMDIR)\$D\image.obj\ - $(XPMDIR)\$D\info.obj\ - $(XPMDIR)\$D\hashtab.obj\ - $(XPMDIR)\$D\misc.obj\ - $(XPMDIR)\$D\parse.obj\ - $(XPMDIR)\$D\rdftodat.obj\ - $(XPMDIR)\$D\rdftoi.obj\ - $(XPMDIR)\$D\rgb.obj\ - $(XPMDIR)\$D\scan.obj\ - $(XPMDIR)\$D\simx.obj\ - $(XPMDIR)\$D\wrffrdat.obj\ - $(XPMDIR)\$D\wrffri.obj - -all: $D $(LIBTARGET) - -$D: - mkdir .\$D - -$(LIBTARGET): $(OBJECTS) - -erase $(LIBTARGET) - $(implib) @<< --out:$@ --machine:$(CPU) -$(OBJECTS) $(PERIPH_LIBS) -<< - -$(XPMDIR)\$D\attrib.obj: $(XPMDIR)\attrib.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\crbuffri.obj: $(XPMDIR)\crbuffri.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\crdatfri.obj: $(XPMDIR)\crdatfri.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\create.obj: $(XPMDIR)\create.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\crifrbuf.obj: $(XPMDIR)\crifrbuf.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\crifrdat.obj: $(XPMDIR)\crifrdat.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\data.obj: $(XPMDIR)\data.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\image.obj: $(XPMDIR)\image.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\info.obj: $(XPMDIR)\info.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\hashtab.obj: $(XPMDIR)\hashtab.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\misc.obj: $(XPMDIR)\misc.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\parse.obj: $(XPMDIR)\parse.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\rdftodat.obj: $(XPMDIR)\rdftodat.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\rdftoi.obj: $(XPMDIR)\rdftoi.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\rgb.obj: $(XPMDIR)\rgb.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\scan.obj: $(XPMDIR)\scan.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\simx.obj: $(XPMDIR)\simx.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\wrffrdat.obj: $(XPMDIR)\wrffrdat.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -$(XPMDIR)\$D\wrffri.obj: $(XPMDIR)\wrffri.c - cl @<< -$(CPPFLAGS2) /c $(*B).c /Fo$@ -<< - -clean: - -$(RM) $D\*.obj - -$(RM) $(LIBTARGET) - -$(RM) *.pdb - -$(RM) *.sbr - -$(RM) *.pch - -cleanall: clean - diff --git a/src/xpm/xpm.dsp b/src/xpm/xpm.dsp deleted file mode 100644 index 07451438e5..0000000000 --- a/src/xpm/xpm.dsp +++ /dev/null @@ -1,186 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xpm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=xpm - 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 "xpm.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 "xpm.mak" CFG="xpm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xpm - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "xpm - 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)" == "xpm - 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 "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX- /O1 /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "xpm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "xpm___Win32_Debug" -# PROP BASE Intermediate_Dir "xpm___Win32_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 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "xpm - Win32 Release" -# Name "xpm - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\attrib.c -# End Source File -# Begin Source File - -SOURCE=.\crbuffri.c -# End Source File -# Begin Source File - -SOURCE=.\crdatfri.c -# End Source File -# Begin Source File - -SOURCE=.\create.c -# End Source File -# Begin Source File - -SOURCE=.\crifrbuf.c -# End Source File -# Begin Source File - -SOURCE=.\crifrdat.c -# End Source File -# Begin Source File - -SOURCE=.\dataxpm.c -# End Source File -# Begin Source File - -SOURCE=.\hashtab.c -# End Source File -# Begin Source File - -SOURCE=.\imagexpm.c -# End Source File -# Begin Source File - -SOURCE=.\info.c -# End Source File -# Begin Source File - -SOURCE=.\misc.c -# End Source File -# Begin Source File - -SOURCE=.\parse.c -# End Source File -# Begin Source File - -SOURCE=.\rdftodat.c -# End Source File -# Begin Source File - -SOURCE=.\rdftoi.c -# End Source File -# Begin Source File - -SOURCE=.\rgb.c -# End Source File -# Begin Source File - -SOURCE=.\scan.c -# End Source File -# Begin Source File - -SOURCE=.\simx.c -# End Source File -# Begin Source File - -SOURCE=.\wrffrdat.c -# End Source File -# Begin Source File - -SOURCE=.\wrffri.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\rgbtab.h -# End Source File -# Begin Source File - -SOURCE=.\simx.h -# End Source File -# Begin Source File - -SOURCE=.\xpm.h -# End Source File -# Begin Source File - -SOURCE=.\xpmi.h -# End Source File -# End Group -# End Target -# End Project -- 2.45.2