prepared for kinsole 1.1 release1.1

git-svn-id: http://svn.klever.net/kin/kinsole/trunk@7 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 43 insertions, 7 deletions

diff --git a/kinsole.mak b/kinsole.mak
index b25a32d..9b7eeac 100644
--- a/kinsole.mak
+++ b/kinsole.mak
@@ -36,221 +36,221 @@ NULL=nul
 ################################################################################

 # Begin Project

 # PROP Target_Last_Scanned "Install - Win32 Debug"

 

 !IF  "$(CFG)" == "KINSole - 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 ""

 OUTDIR=.\Release

 INTDIR=.\Release

 # Begin Custom Macros

 OutDir=.\Release

 TargetName=kinsole

 # End Custom Macros

 

 ALL : "$(OUTDIR)\kinsole.exe" "$(OUTDIR)\kinsole.ex_" "$(OUTDIR)\kinsole.hlp"\

  "$(OUTDIR)\kinsole.cnt" "$(OUTDIR)\kinsole.hl_" "$(OUTDIR)\kinsole.cn_"

 

 CLEAN : 

 	-@erase "$(INTDIR)\kinsole.cn_"

 	-@erase "$(INTDIR)\kinsole.cnt"

 	-@erase "$(INTDIR)\kinsole.hl_"

 	-@erase "$(INTDIR)\kinsole.hlp"

 	-@erase "$(INTDIR)\KINSole.obj"

-	-@erase "$(INTDIR)\KINSole.res"

+	-@erase "$(INTDIR)\kinsole.res"

 	-@erase "$(OUTDIR)\kinsole.ex_"

 	-@erase "$(OUTDIR)\kinsole.exe"

 	-@erase "$(OUTDIR)\kinsole.map"

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

 # SUBTRACT CPP /YX

 CPP_PROJ=/nologo /ML /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

  /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Release/

 CPP_SBRS=.\.

 

 .c{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .cpp{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .cxx{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .c{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 .cpp{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 .cxx{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KINSole.res" /d "NDEBUG" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/kinsole.res" /d "NDEBUG" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/kinsole.bsc" 

 BSC32_SBRS= \

 	

 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 odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /map /machine:I386

 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\

  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\

  odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\

  /pdb:"$(OUTDIR)/kinsole.pdb" /map:"$(INTDIR)/kinsole.map" /machine:I386\

  /out:"$(OUTDIR)/kinsole.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\KINSole.obj" \

-	"$(INTDIR)\KINSole.res"

+	"$(INTDIR)\kinsole.res"

 

 "$(OUTDIR)\kinsole.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

 # Begin Custom Build - Performing Custom Build Step

 OutDir=.\Release

 TargetName=kinsole

 InputPath=.\Release\kinsole.exe

 SOURCE=$(InputPath)

 

 "$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_

 

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "KINSole - 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 2

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 OUTDIR=.\Debug

 INTDIR=.\Debug

 # Begin Custom Macros

 OutDir=.\Debug

 TargetName=kinsole

 # End Custom Macros

 

 ALL : "$(OUTDIR)\kinsole.exe" "$(OUTDIR)\kinsole.ex_" "$(OUTDIR)\kinsole.hlp"\

  "$(OUTDIR)\kinsole.cnt" "$(OUTDIR)\kinsole.hl_" "$(OUTDIR)\kinsole.cn_"

 

 CLEAN : 

 	-@erase "$(INTDIR)\kinsole.cn_"

 	-@erase "$(INTDIR)\kinsole.cnt"

 	-@erase "$(INTDIR)\kinsole.hl_"

 	-@erase "$(INTDIR)\kinsole.hlp"

 	-@erase "$(INTDIR)\KINSole.obj"

-	-@erase "$(INTDIR)\KINSole.res"

+	-@erase "$(INTDIR)\kinsole.res"

 	-@erase "$(INTDIR)\vc40.idb"

 	-@erase "$(INTDIR)\vc40.pdb"

 	-@erase "$(OUTDIR)\kinsole.ex_"

 	-@erase "$(OUTDIR)\kinsole.exe"

 	-@erase "$(OUTDIR)\kinsole.ilk"

 	-@erase "$(OUTDIR)\kinsole.pdb"

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_AFXDLL" /D "_MBCS" /c

 # SUBTRACT CPP /YX

 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

  /D "_AFXDLL" /D "_MBCS" /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

 

 .c{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .cpp{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .cxx{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

 

 .c{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 .cpp{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 .cxx{$(CPP_SBRS)}.sbr:

    $(CPP) $(CPP_PROJ) $<  

 

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KINSole.res" /d "_DEBUG" /d "_AFXDLL" 

+RSC_PROJ=/l 0x409 /fo"$(INTDIR)/kinsole.res" /d "_DEBUG" /d "_AFXDLL" 

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 BSC32_FLAGS=/nologo /o"$(OUTDIR)/kinsole.bsc" 

 BSC32_SBRS= \

 	

 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 odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

 # ADD LINK32 wsock32.lib /nologo /subsystem:console /debug /machine:I386

 LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:yes\

  /pdb:"$(OUTDIR)/kinsole.pdb" /debug /machine:I386 /out:"$(OUTDIR)/kinsole.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\KINSole.obj" \

-	"$(INTDIR)\KINSole.res"

+	"$(INTDIR)\kinsole.res"

 

 "$(OUTDIR)\kinsole.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

 # Begin Custom Build

 OutDir=.\Debug

 TargetName=kinsole

 InputPath=.\Debug\kinsole.exe

 SOURCE=$(InputPath)

 

 "$(OutDir)\$(TargetName).ex_" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    compress $(OutDir)\$(TargetName).exe $(OutDir)\$(TargetName).ex_

 

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "Install - Win32 Release"

 

 # PROP BASE Use_MFC 2

 # PROP BASE Use_Debug_Libraries 0

 # PROP BASE Output_Dir "Install\Release"

 # PROP BASE Intermediate_Dir "Install\Release"

 # PROP BASE Target_Dir "Install"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Install\Release"

 # PROP Intermediate_Dir "Install\Release"

 # PROP Target_Dir "Install"

 OUTDIR=.\Install\Release

 INTDIR=.\Install\Release

 

@@ -394,91 +394,127 @@ LINK32=link.exe
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib /nologo /subsystem:windows /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 odbc32.lib\

  odbccp32.lib version.lib /nologo /subsystem:windows /incremental:yes\

  /pdb:"$(OUTDIR)/Install.pdb" /debug /machine:I386 /out:"$(OUTDIR)/Install.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\install.obj" \

 	"$(INTDIR)\Install.res"

 

 "$(OUTDIR)\Install.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

 !ENDIF 

 

 ################################################################################

 # Begin Target

 

 # Name "KINSole - Win32 Release"

 # Name "KINSole - Win32 Debug"

 

 !IF  "$(CFG)" == "KINSole - Win32 Release"

 

 !ELSEIF  "$(CFG)" == "KINSole - Win32 Debug"

 

 !ENDIF 

 

 ################################################################################

 # Begin Source File

 

 SOURCE=.\KINSole.cpp

+

+!IF  "$(CFG)" == "KINSole - Win32 Release"

+

 DEP_CPP_KINSO=\

 	".\NAWS.cpp"\

 	".\NEW-ENVIRON.cpp"\

 	".\options.cpp"\

 	".\status.cpp"\

 	".\terminal.cpp"\

 	".\TIMING-MARK.cpp"\

 	".\TTY.cpp"\

 	".\VT100.cpp"\

 	

 

 "$(INTDIR)\KINSole.obj" : $(SOURCE) $(DEP_CPP_KINSO) "$(INTDIR)"

 

 

+!ELSEIF  "$(CFG)" == "KINSole - Win32 Debug"

+

+DEP_CPP_KINSO=\

+	".\NAWS.cpp"\

+	".\NEW-ENVIRON.cpp"\

+	".\options.cpp"\

+	".\status.cpp"\

+	".\terminal.cpp"\

+	".\TIMING-MARK.cpp"\

+	".\TTY.cpp"\

+	".\VT100.cpp"\

+	

+

+"$(INTDIR)\KINSole.obj" : $(SOURCE) $(DEP_CPP_KINSO) "$(INTDIR)"

+

+

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\kinsole.rc

+

+!IF  "$(CFG)" == "KINSole - Win32 Release"

+

 DEP_RSC_KINSOL=\

 	".\res\kinsole.ico"\

 	

 

-"$(INTDIR)\KINSole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)"

+"$(INTDIR)\kinsole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)"

    $(RSC) $(RSC_PROJ) $(SOURCE)

 

 

+!ELSEIF  "$(CFG)" == "KINSole - Win32 Debug"

+

+DEP_RSC_KINSOL=\

+	".\res\kinsole.ico"\

+	

+

+"$(INTDIR)\kinsole.res" : $(SOURCE) $(DEP_RSC_KINSOL) "$(INTDIR)"

+   $(RSC) $(RSC_PROJ) $(SOURCE)

+

+

+!ENDIF 

+

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\VT100.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=".\NEW-ENVIRON.cpp"

 # PROP Exclude_From_Build 1

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\help\kinsole.hpj

 

 !IF  "$(CFG)" == "KINSole - Win32 Release"

 

 # Begin Custom Build - Building Help

 OutDir=.\Release

 TargetName=kinsole

 InputPath=.\help\kinsole.hpj

 

 BuildCmds= \

 	makehelp \

 	compress $(OutDir)\$(TargetName).hlp $(OutDir)\$(TargetName).hl_ \

 	compress $(OutDir)\$(TargetName).cnt $(OutDir)\$(TargetName).cn_ \

 	

 

 "$(OutDir)\$(TargetName).hlp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"