# HG changeset patch # User Claus Gittinger # Date 820366509 -3600 # Node ID ae2b682713ea7aeb6922dcf67585c9752e91a5e7 # Parent 915a83c78dabdf284a2d9b7aea9863de82bcb0f5 *** empty log message *** diff -r 915a83c78dab -r ae2b682713ea Make.proto --- a/Make.proto Fri Dec 22 12:26:34 1995 +0100 +++ b/Make.proto Sun Dec 31 00:35:09 1995 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.6 1995-12-22 11:26:34 cg Exp $ +# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.7 1995-12-30 23:35:09 cg Exp $ # # -------------- no need to change anything below ---------- @@ -22,7 +22,7 @@ PCXReader.$(O) \ XPMReader.$(O) \ XWDReader.$(O) \ - STFormReader.$(O) \ + STFormRdr.$(O) \ TargaReader.$(O) \ FaceReader.$(O) diff -r 915a83c78dab -r ae2b682713ea bc.mak --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bc.mak Sun Dec 31 00:35:09 1995 +0100 @@ -0,0 +1,187 @@ +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +!IF "$(CFG)" == "" +CFG=Win32 Debug +!MESSAGE No configuration specified. Defaulting to Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "Win32 Release" && "$(CFG)" != "Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE on this makefile +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "nt.mak" CFG="Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +################################################################################ +# Begin Project +# PROP Target_Last_Scanned "Win32 Debug" +CPP=cl.exe +RSC=rc.exe + +BINDIR=..\bin +LIBDIR=..\lib + +ALL : libview2 + +libview2: $(LIBDIR)\libview2.lib $(BINDIR)\libview2.dll + +$(LIBDIR) : + if not exist $(LIBDIR)/nul mkdir $(LIBDIR) + + +!IF "$(CFG)" == "Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "WinDebug" +# PROP BASE Intermediate_Dir "WinDebug" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "WinDebug" +# PROP Intermediate_Dir "WinDebug" +OUTDIR=.\WinDebug +INTDIR=.\WinDebug + +$(OUTDIR) : + if not exist $(OUTDIR)/nul mkdir $(OUTDIR) + +DEFS=/D"DEBUG" /D"WIN32" /D"_CONSOLE" +O=obj + +# ADD BASE CPP /nologo /W3 /GX /Zi /YX /Od /D "WIN32" /D "DEBUG" /D "_CONSOLE" /FR /c +# ADD CPP /nologo /W3 /GX /Zi /YX /Ob1 /I "..\include" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /c +# SUBTRACT CPP /WX +CPP_PROJ=/nologo /W3 /GX /Zi /YX /Ob1 /I "..\include" $(DEFS) /FR$(INTDIR)/\ + /Fp$(OUTDIR)/"libview2nt.pch" /Fo$(INTDIR)/ /Fd$(OUTDIR)/"libview2nt.pdb" /c +CPP_OBJS=.\WinDebug/ +# ADD BASE RSC /l 0x409 /d "DEBUG" +# ADD RSC /l 0x409 /d "DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo + +.\WinDebug\stcnt.bsc : $(OUTDIR) $(BSC32_SBRS) + $(BSC32) @<< + $(BSC32_FLAGS) $(BSC32_SBRS) +<< + +LIBRUN=..\lib\librun.lib + +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:console /DEBUG /MACHINE:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /NOLOGO /SUBSYSTEM:console /DEBUG /MACHINE:I386 + +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ + wsock32.lib \ + $(LIBRUN) \ + /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes\ + /PDB:$(OUTDIR)/"libview2nt.pdb" /DEBUG /MACHINE:I386 /DLL \ + /OUT:"WinDebug\libview2.dll" /DEF:nt.def +DEF_FILE=nt.def +LINK32_OBJS= \ + ClrValue.$(O) \ + Icon.$(O) \ + DObject.$(O) \ + InputView.$(O) \ + Model.$(O) \ + AppModel.$(O) \ + ValModel.$(O) \ + PlugAdptr.$(O) \ + BlockValue.$(O) \ + ValHolder.$(O) \ + TriggerVal.$(O) \ + ProtAdptr.$(O) \ + AspctAdptr.$(O) \ + BuffValHldr.$(O) \ + Plug.$(O) \ + StdSysC.$(O) \ + Layout.$(O) \ + LayoutOrg.$(O) \ + LayoutFrm.$(O) \ + AlignOrg.$(O) \ + EventListener.$(O) \ + ActiveHelp.$(O) \ + ActiveHelpView.$(O) \ + WinBuilder.$(O) \ + UIBuilder.$(O) \ + TIFFRdr.$(O) \ + GIFReader.$(O) \ + XBMReader.$(O) \ + SunReader.$(O) \ + WinIconRdr.$(O) \ + PCXReader.$(O) \ + XPMReader.$(O) \ + XWDReader.$(O) \ + STFormRdr.$(O) \ + TargaReader.$(O) \ + FaceReader.$(O) \ + libview2Init.obj + +$(BINDIR)\libview2.dll: $(OUTDIR)\libview2.dll + -copy $(OUTDIR)\libview2.dll $(BINDIR)\*.* + +$(LIBDIR)\libview2.lib: $(OUTDIR)\libview2.lib + -copy $(OUTDIR)\libview2.lib $(LIBDIR)\*.* + +.\WinDebug\libview2.lib : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) + -$(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +.\WinDebug\libview2.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LIBRUN) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +xlib.obj: ..\support\ntxlib\xlib.obj + -copy ..\support\ntxlib\xlib.obj *.* + +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ + wsock32.lib \ + $(LIBRUN) \ + /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes\ + /PDB:$(OUTDIR)/"xlibnt.pdb" /DEBUG /MACHINE:I386 /DLL \ + /OUT:"WinDebug\xlib.dll" /DEF:xlib.def + +!ENDIF + +.c{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cpp{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cxx{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +############################################################################ +# Begin Group "src" + +STC=..\bin\stc +INCL=-I"..\include" +STCFLAGS=-H..\include +DBGFLAGS=-Yd +# FFLAGS=-Fo.\WinDebug + +.SUFFIXES: .st .obj + +.st.obj: + $(STC) $(INCL) $(FFLAGS) $(STCFLAGS) $(DBGFLAGS) $(DEFS) -c $< + +.c.obj: + $(CC) $(INCL) $(FFLAGS) $(DEFS) $(DBGFLAGS) -c $< + +# End Source File +############################################################################ + +# End Group +# End Project +############################################################################ diff -r 915a83c78dab -r ae2b682713ea nt.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nt.def Sun Dec 31 00:35:09 1995 +0100 @@ -0,0 +1,9 @@ +LIBRARY libview2 +CODE EXECUTE READ SHARED +DATA READ WRITE +SECTIONS + INITCODE READ EXECUTE SHARED + INITDATA READ WRITE +EXPORTS + _libview2_Init +IMPORTS diff -r 915a83c78dab -r ae2b682713ea nt.mak --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nt.mak Sun Dec 31 00:35:09 1995 +0100 @@ -0,0 +1,187 @@ +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +!IF "$(CFG)" == "" +CFG=Win32 Debug +!MESSAGE No configuration specified. Defaulting to Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "Win32 Release" && "$(CFG)" != "Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE on this makefile +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "nt.mak" CFG="Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +################################################################################ +# Begin Project +# PROP Target_Last_Scanned "Win32 Debug" +CPP=cl.exe +RSC=rc.exe + +BINDIR=..\bin +LIBDIR=..\lib + +ALL : libview2 + +libview2: $(LIBDIR)\libview2.lib $(BINDIR)\libview2.dll + +$(LIBDIR) : + if not exist $(LIBDIR)/nul mkdir $(LIBDIR) + + +!IF "$(CFG)" == "Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "WinDebug" +# PROP BASE Intermediate_Dir "WinDebug" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "WinDebug" +# PROP Intermediate_Dir "WinDebug" +OUTDIR=.\WinDebug +INTDIR=.\WinDebug + +$(OUTDIR) : + if not exist $(OUTDIR)/nul mkdir $(OUTDIR) + +DEFS=/D"DEBUG" /D"WIN32" /D"_CONSOLE" +O=obj + +# ADD BASE CPP /nologo /W3 /GX /Zi /YX /Od /D "WIN32" /D "DEBUG" /D "_CONSOLE" /FR /c +# ADD CPP /nologo /W3 /GX /Zi /YX /Ob1 /I "..\include" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /c +# SUBTRACT CPP /WX +CPP_PROJ=/nologo /W3 /GX /Zi /YX /Ob1 /I "..\include" $(DEFS) /FR$(INTDIR)/\ + /Fp$(OUTDIR)/"libview2nt.pch" /Fo$(INTDIR)/ /Fd$(OUTDIR)/"libview2nt.pdb" /c +CPP_OBJS=.\WinDebug/ +# ADD BASE RSC /l 0x409 /d "DEBUG" +# ADD RSC /l 0x409 /d "DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo + +.\WinDebug\stcnt.bsc : $(OUTDIR) $(BSC32_SBRS) + $(BSC32) @<< + $(BSC32_FLAGS) $(BSC32_SBRS) +<< + +LIBRUN=..\lib\librun.lib + +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:console /DEBUG /MACHINE:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /NOLOGO /SUBSYSTEM:console /DEBUG /MACHINE:I386 + +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ + wsock32.lib \ + $(LIBRUN) \ + /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes\ + /PDB:$(OUTDIR)/"libview2nt.pdb" /DEBUG /MACHINE:I386 /DLL \ + /OUT:"WinDebug\libview2.dll" /DEF:nt.def +DEF_FILE=nt.def +LINK32_OBJS= \ + ClrValue.$(O) \ + Icon.$(O) \ + DObject.$(O) \ + InputView.$(O) \ + Model.$(O) \ + AppModel.$(O) \ + ValModel.$(O) \ + PlugAdptr.$(O) \ + BlockValue.$(O) \ + ValHolder.$(O) \ + TriggerVal.$(O) \ + ProtAdptr.$(O) \ + AspctAdptr.$(O) \ + BuffValHldr.$(O) \ + Plug.$(O) \ + StdSysC.$(O) \ + Layout.$(O) \ + LayoutOrg.$(O) \ + LayoutFrm.$(O) \ + AlignOrg.$(O) \ + EventListener.$(O) \ + ActiveHelp.$(O) \ + ActiveHelpView.$(O) \ + WinBuilder.$(O) \ + UIBuilder.$(O) \ + TIFFRdr.$(O) \ + GIFReader.$(O) \ + XBMReader.$(O) \ + SunReader.$(O) \ + WinIconRdr.$(O) \ + PCXReader.$(O) \ + XPMReader.$(O) \ + XWDReader.$(O) \ + STFormRdr.$(O) \ + TargaReader.$(O) \ + FaceReader.$(O) \ + libview2Init.obj + +$(BINDIR)\libview2.dll: $(OUTDIR)\libview2.dll + -copy $(OUTDIR)\libview2.dll $(BINDIR)\*.* + +$(LIBDIR)\libview2.lib: $(OUTDIR)\libview2.lib + -copy $(OUTDIR)\libview2.lib $(LIBDIR)\*.* + +.\WinDebug\libview2.lib : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) + -$(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +.\WinDebug\libview2.dll : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LIBRUN) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +xlib.obj: ..\support\ntxlib\xlib.obj + -copy ..\support\ntxlib\xlib.obj *.* + +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ + wsock32.lib \ + $(LIBRUN) \ + /NOLOGO /SUBSYSTEM:console /INCREMENTAL:yes\ + /PDB:$(OUTDIR)/"xlibnt.pdb" /DEBUG /MACHINE:I386 /DLL \ + /OUT:"WinDebug\xlib.dll" /DEF:xlib.def + +!ENDIF + +.c{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cpp{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +.cxx{$(CPP_OBJS)}.obj: + $(CPP) $(CPP_PROJ) $< + +############################################################################ +# Begin Group "src" + +STC=..\bin\stc +INCL=-I"..\include" +STCFLAGS=-H..\include +DBGFLAGS=-Yd +# FFLAGS=-Fo.\WinDebug + +.SUFFIXES: .st .obj + +.st.obj: + $(STC) $(INCL) $(FFLAGS) $(STCFLAGS) $(DBGFLAGS) $(DEFS) -c $< + +.c.obj: + $(CC) $(INCL) $(FFLAGS) $(DEFS) $(DBGFLAGS) -c $< + +# End Source File +############################################################################ + +# End Group +# End Project +############################################################################