stoddard 00/01/24 12:50:47
Modified: src/os/win32 ApacheOS.dsp ApacheOS.mak
Log:
Add APR include file search path to the release build
Revision Changes Path
1.3 +1 -1 apache-2.0/src/os/win32/ApacheOS.dsp
Index: ApacheOS.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheOS.dsp 2000/01/20 20:58:43 1.2
+++ ApacheOS.dsp 2000/01/24 20:50:43 1.3
@@ -39,7 +39,7 @@
# PROP Intermediate_Dir "ApacheOSR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX
/FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX
/FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../lib/apr/include" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
1.3 +27 -52 apache-2.0/src/os/win32/ApacheOS.mak
Index: ApacheOS.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheOS.mak 2000/01/20 20:58:46 1.2
+++ ApacheOS.mak 2000/01/24 20:50:44 1.3
@@ -26,6 +26,8 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+
!IF "$(CFG)" == "ApacheOS - Win32 Release"
OUTDIR=.\ApacheOSR
@@ -52,42 +54,11 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-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_PROJ=/nologo /MD /W3 /GX /O2 /I "../../lib/apr/include" /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,12 +99,26 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /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) @<<
@@ -165,22 +150,6 @@
$(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)" ==\
"ApacheOS - Win32 Debug"
@@ -189,10 +158,14 @@
!IF "$(CFG)" == "ApacheOS - Win32 Release"
DEP_CPP_OS_C0=\
+ "..\..\lib\apr\include\apr_errno.h"\
+ "..\..\lib\apr\include\apr_general.h"\
+ "..\..\lib\apr\include\apr_win.h"\
".\os.h"\
+ {$(INCLUDE)}"sys\types.h"\
NODEP_CPP_OS_C0=\
- ".\apr_win.h"\
+ "..\..\lib\apr\include\apr.h"\
"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)"
@@ -201,6 +174,8 @@
!ELSEIF "$(CFG)" == "ApacheOS - Win32 Debug"
DEP_CPP_OS_C0=\
+ "..\..\lib\apr\include\apr_errno.h"\
+ "..\..\lib\apr\include\apr_general.h"\
"..\..\lib\apr\include\apr_win.h"\
".\os.h"\
