httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/win32 Win9xConHook.dsp
Date Fri, 23 May 2003 03:06:06 GMT
wrowe       2003/05/22 20:06:06

  Modified:    src      makefile.win
               src/os/win32 Win9xConHook.dsp
  Log:
    Fix the build exceptions by adding the last diagnostics to Win9xConHook
    and changing the ApacheCore.pdb target.  All seems well, all looks good.
  
  Revision  Changes    Path
  1.30      +1 -1      apache-1.3/src/makefile.win
  
  Index: makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/makefile.win,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- makefile.win	23 May 2003 02:47:50 -0000	1.29
  +++ makefile.win	23 May 2003 03:06:06 -0000	1.30
  @@ -184,7 +184,7 @@
   	copy lib\expat-lite\$(LONG)\xmlparse.exp "$(INSTDIR)\libexec"
   	copy lib\expat-lite\$(LONG)\xmlparse.lib "$(INSTDIR)\libexec"
   	copy $(LONG)\Apache.pdb "$(INSTDIR)"
  -	copy $(LONG)\ApacheCore.pdb "$(INSTDIR)\symbols\bin"
  +	copy $(LONG)\ApacheCore.pdb "$(INSTDIR)\bin"
   	copy os\win32\$(LONG)\Win9xConHook.pdb "$(INSTDIR)\bin"
   	copy lib\expat-lite\$(LONG)\xmltok.pdb "$(INSTDIR)\bin"
   	copy lib\expat-lite\$(LONG)\xmlparse.pdb "$(INSTDIR)\bin"
  
  
  
  1.7       +7 -7      apache-1.3/src/os/win32/Win9xConHook.dsp
  
  Index: Win9xConHook.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/Win9xConHook.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Win9xConHook.dsp	4 Oct 2001 03:52:59 -0000	1.6
  +++ Win9xConHook.dsp	23 May 2003 03:06:06 -0000	1.7
  @@ -42,8 +42,8 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\Win9xConHook"
/FD /c
  +# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /Zi /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"
/Fd"Release\Win9xConHook_src" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/map /machine:I386 /base:"0x1c0f0000"
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/map /machine:I386 /base:"0x1c0f0000"
  +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/debug /machine:I386 /base:"0x1c0f0000" /opt:ref
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/debug /machine:I386 /base:"0x1c0f0000" /opt:ref
   
   !ELSEIF  "$(CFG)" == "Win9xConHook - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"
/Fd"Debug\Win9xConHook" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"
/Fd"Debug\Win9xConHook_src" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -78,8 +78,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/map /debug /machine:I386 /base:"0x1c0f0000"
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/map /debug /machine:I386 /base:"0x1c0f0000"
  +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/debug /machine:I386 /base:"0x1c0f0000"
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no
/debug /machine:I386 /base:"0x1c0f0000"
   
   !ENDIF 
   
  
  
  

Mime
View raw message