cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak

1998-01-24 Thread ben
ben 98/01/24 08:12:09

  Modified:src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Was using the wrong libraries!
  
  Revision  ChangesPath
  1.5   +1 -1  apachen/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheOS.dsp  1997/09/14 15:26:02 1.4
  +++ ApacheOS.dsp  1998/01/24 16:12:08 1.5
  @@ -60,7 +60,7 @@
   # PROP Intermediate_Dir "ApacheOSD"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/YX /FD /c
  -# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX 
/FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.5   +19 -51apachen/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheOS.mak  1997/09/14 15:26:02 1.4
  +++ ApacheOS.mak  1998/01/24 16:12:08 1.5
  @@ -26,6 +26,8 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
   OUTDIR=.\ApacheOSR
  @@ -52,42 +54,10 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSR/
   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) $< 
  -<<
  -
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
   BSC32_SBRS= \
  @@ -128,11 +98,25 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /MLd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSD/
   CPP_SBRS=.
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  +BSC32_SBRS= \
  + 
  +LIB32=link.exe -lib
  +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  +LIB32_OBJS= \
  + "$(INTDIR)\os.obj"
  +
  +"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  +$(LIB32) @<<
  +  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  +<<
  +
  +!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
  $(CPP) @<<
  @@ -163,22 +147,6 @@
  $(CPP) @<<
  $(CPP_PROJ) $< 
   <<
  -
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  -BSC32_SBRS= \
  - 
  -LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  -LIB32_OBJS= \
  - "$(INTDIR)\os.obj"
  -
  -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  -$(LIB32) @<<
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -<<
  -
  -!ENDIF 
   
   
   !IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\
  
  
  


cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak

1997-09-14 Thread Paul Sutton
pcs 97/09/14 08:26:04

  Modified:src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  By popular request... make ApacheOS into a static library instead of a DLL.
  
  Revision  ChangesPath
  1.4   +15 -36apachen/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheOS.dsp  1997/09/14 12:09:00 1.3
  +++ ApacheOS.dsp  1997/09/14 15:26:02 1.4
  @@ -2,7 +2,7 @@
   # Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
  -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  +# TARGTYPE "Win32 (x86) Static Library" 0x0104
   
   CFG=ApacheOS - Win32 Debug
   !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  @@ -17,17 +17,14 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheOS - Win32 Release" (based on\
  - "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheOS - Win32 Debug" (based on "Win32 (x86) Dynamic-Link 
Library")
  +!MESSAGE "ApacheOS - Win32 Release" (based on "Win32 (x86) Static Library")
  +!MESSAGE "ApacheOS - Win32 Debug" (based on "Win32 (x86) Static Library")
   !MESSAGE 
   
   # Begin Project
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
   
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
  @@ -40,46 +37,36 @@
   # PROP Use_Debug_Libraries 0
   # PROP Output_Dir "ApacheOSR"
   # PROP Intermediate_Dir "ApacheOSR"
  -# 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX 
/FD /c
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  -# ADD BASE RSC /l 0x809 /d "NDEBUG"
  -# ADD RSC /l 0x809 /d "NDEBUG"
  +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX 
/FD /c
  +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
   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 
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /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 /nologo /subsystem:windows /dll /machine:I386
  +LIB32=link.exe -lib
  +# ADD BASE LIB32 /nologo
  +# ADD LIB32 /nologo
   
   !ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir "ApacheOS"
  -# PROP BASE Intermediate_Dir "ApacheOS"
  +# 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 "ApacheOSD"
   # PROP Intermediate_Dir "ApacheOSD"
  -# 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /YX /FD /c
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  -# ADD BASE RSC /l 0x809 /d "_DEBUG"
  -# ADD RSC /l 0x809 /d "_DEBUG"
  +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/YX /FD /c
  +# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX 
/FD /c
   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 
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 
/pdbtype:sept
  -# 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  +LIB32=link.exe -lib
  +# ADD BASE LIB32 /nologo
  +# ADD LIB32 /nologo
   
   !ENDIF 
   
  @@ -87,21 +74,13 @@
   
   # Name "ApacheOS - Win32 Release"
   # Name "ApacheOS - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "c"
   # Begin Source File
   
   SOURCE=.\os.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter ""
   # Begin Source File
   
   SOURCE=.\os.h
   # End Source File
  -# End Group
   # End Target
   # End Project
  
  
  
  1.4   +63 -51ap

cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak

1997-09-14 Thread Paul Sutton
pcs 97/09/14 05:09:02

  Modified:src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Don't copy os.h in release build
  
  Revision  ChangesPath
  1.3   +0 -9  apachen/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheOS.dsp  1997/09/13 23:46:29 1.2
  +++ ApacheOS.dsp  1997/09/14 12:09:00 1.3
  @@ -54,15 +54,6 @@
   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:windows /dll /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 /nologo /subsystem:windows /dll /machine:I386
  -# Begin Custom Build - Copy os.h to main
  -ProjDir=.
  -InputPath=.\ApacheOSR\ApacheOS.dll
  -SOURCE=$(InputPath)
  -
  -"$(ProjDir)\..\..\main\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  - COPY os.h $(ProjDir)\..\..\main
  -
  -# End Custom Build
   
   !ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
   
  
  
  
  1.3   +2 -11 apachen/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===
  RCS file: /export/home/cvs/apachen/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheOS.mak  1997/09/13 23:46:30 1.2
  +++ ApacheOS.mak  1997/09/14 12:09:01 1.3
  @@ -37,16 +37,15 @@
   INTDIR=.\ApacheOSR
   # Begin Custom Macros
   OutDir=.\ApacheOSR
  -ProjDir=.
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
   
  -ALL : "$(OUTDIR)\ApacheOS.dll" "$(ProjDir)\..\..\main\os.h"
  +ALL : "$(OUTDIR)\ApacheOS.dll"
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\ApacheOS.dll" "$(ProjDir)\..\..\main\os.h"
  +ALL : "$(OUTDIR)\ApacheOS.dll"
   
   !ENDIF 
   
  @@ -56,7 +55,6 @@
[EMAIL PROTECTED] "$(OUTDIR)\ApacheOS.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheOS.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheOS.lib"
  - [EMAIL PROTECTED] "$(ProjDir)\..\..\main\os.h"
   
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  @@ -83,13 +81,6 @@
   $(LINK32) @<<
 $(LINK32_FLAGS) $(LINK32_OBJS)
   <<
  -
  -ProjDir=.
  -InputPath=.\ApacheOSR\ApacheOS.dll
  -SOURCE=$(InputPath)
  -
  -"$(ProjDir)\..\..\main\os.h"  : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  - COPY os.h $(ProjDir)\..\..\main
   
   !ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
   
  
  
  


cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak

1997-09-13 Thread Ben Laurie
ben 97/09/13 16:46:31

  Modified:src  ApacheCore.dsp ApacheCore.mak
   src/main conf.h
   src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Use os.h in its original place.
  
  Revision  ChangesPath
  1.10  +4 -0  apachen/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheCore.dsp1997/09/12 08:05:41 1.9
  +++ ApacheCore.dsp1997/09/13 23:46:25 1.10
  @@ -337,6 +337,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\os\win32\os.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\os\win32\readdir.h
   # End Source File
   # Begin Source File
  
  
  
  1.17  +72 -106   apachen/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApacheCore.mak1997/09/13 23:10:47 1.16
  +++ ApacheCore.mak1997/09/13 23:46:26 1.17
  @@ -28,6 +28,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   OUTDIR=.\CoreR
  @@ -97,46 +101,12 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreR/
   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) $< 
  -<<
  -
  -MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" 
   BSC32_SBRS= \
  @@ -314,46 +284,12 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D 
"WIN32"\
/D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" 
/YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreD/
   CPP_SBRS=.\CoreD/
  -
  -.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) $< 
  -<<
  -
  -MTL=midl.exe
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" 
   BSC32_SBRS= \
  @@ -465,6 +401,36 @@
   
   !ENDIF 
   
  +.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) $< 
  +<<
  +
   
   !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
  @@ -494,7 +460,7 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\multithread.h"\
  - ".\main\os.h"\
  + ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -532,7 +498,7 @@
".\main\conf.h"\
".\main\http_main.h"\
".\main\httpd.h"\
  - ".\main\os.h"\
  + ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -630,7 +596,7 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
  - ".\main\os.h"\
  + ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -678,7 +644,7 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
  - ".\main\os.h"\
  + ".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\

  @@ -734,10 +700,10 @@
".\main\http_request.h"\
".\main\httpd.h"\
".\main\md5.h"\
  - ".\main\os.h"\
"

cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak os.c os.h

1997-09-12 Thread Paul Sutton
pcs 97/09/12 01:03:52

  Added:   src/os/win32 ApacheOS.dsp ApacheOS.mak os.c os.h
  Log:
  Add ApacheOS project to build the OS abstraction libary (in DLL form)
  for Win32 systems. This project/makefile also copies the required header(s)
  (currently just os.h) to src/main, so must be build *before* any other
  project/makefile.
  
  Revision  ChangesPath
  1.1  apachen/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  # Microsoft Developer Studio Project File - Name="ApacheOS" - Package 
Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=ApacheOS - 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 "ApacheOS.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 "ApacheOS.mak" CFG="ApacheOS - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "ApacheOS - Win32 Release" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "ApacheOS - Win32 Debug" (based on "Win32 (x86) Dynamic-Link 
Library")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "ApacheOS - 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 "ApacheOSR"
  # PROP Intermediate_Dir "ApacheOSR"
  # 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX 
/FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x809 /d "NDEBUG"
  # ADD RSC /l 0x809 /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 odbc32.lib 
odbccp32.lib /nologo /subsystem:windows /dll /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 /nologo /subsystem:windows /dll /machine:I386
  # Begin Custom Build - Copy os.h to main
  ProjDir=.
  InputPath=.\ApacheOSR\ApacheOS.dll
  SOURCE=$(InputPath)
  
  "$(ProjDir)\..\..\main\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
COPY os.h $(ProjDir)\..\..\main
  
  # End Custom Build
  
  !ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "ApacheOS"
  # PROP BASE Intermediate_Dir "ApacheOS"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "ApacheOSD"
  # PROP Intermediate_Dir "ApacheOSD"
  # 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /YX /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x809 /d "_DEBUG"
  # ADD RSC /l 0x809 /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 odbc32.lib 
odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  # Begin Custom Build - Copy os.h to main
  ProjDir=.
  InputPath=.\ApacheOSD\ApacheOS.dll
  SOURCE=$(InputPath)
  
  "$(ProjDir)\..\..\main\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
COPY os.h $(ProjDir)\..\..\main
  
  # End Custom Build
  
  !ENDIF 
  
  # Begin Target
  
  # Name "ApacheOS - Win32 Release"
  # Name "ApacheOS - Win32 Debug"
  # Begin Group "Source Files"
  
  # PROP Default_Filter "c"
  # Begin Source File
  
  SOURCE=.\os.c
  # End Source File
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\os.h
  # End Source Fi