You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2001/10/12 16:51:37 UTC
cvs commit: httpd-win32-msi/src .cvsignore real_features.dsp real_features.mak
wrowe 01/10/12 07:51:37
Modified: src real_features.dsp real_features.mak
Added: src .cvsignore
Log:
Update to VC6/msvc _fn@4 symbol semantics
Revision Changes Path
1.5 +6 -6 httpd-win32-msi/src/real_features.dsp
Index: real_features.dsp
===================================================================
RCS file: /home/cvs/httpd-win32-msi/src/real_features.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- real_features.dsp 2001/08/18 23:13:29 1.4
+++ real_features.dsp 2001/10/12 14:51:37 1.5
@@ -33,8 +33,8 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "real_fea"
-# PROP BASE Intermediate_Dir "real_fea"
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release\real_features" /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 0x409 /d "NDEBUG"
@@ -60,8 +60,8 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "real_fe0"
-# PROP BASE Intermediate_Dir "real_fe0"
+# PROP BASE Output_Dir ""
+# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\real_features" /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 0x409 /d "_DEBUG"
1.3 +71 -69 httpd-win32-msi/src/real_features.mak
Index: real_features.mak
===================================================================
RCS file: /home/cvs/httpd-win32-msi/src/real_features.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- real_features.mak 2001/02/28 04:25:53 1.2
+++ real_features.mak 2001/10/12 14:51:37 1.3
@@ -4,8 +4,7 @@
!MESSAGE No configuration specified. Defaulting to real_features - Win32 Debug.
!ENDIF
-!IF "$(CFG)" != "real_features - Win32 Release" && "$(CFG)" !=\
- "real_features - Win32 Debug"
+!IF "$(CFG)" != "real_features - Win32 Release" && "$(CFG)" != "real_features - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
@@ -14,10 +13,8 @@
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "real_features - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "real_features - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "real_features - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "real_features - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
@@ -28,10 +25,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "real_features - Win32 Release"
OUTDIR=.
@@ -40,41 +33,61 @@
OutDir=.
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
ALL : "$(OUTDIR)\real_features.dll"
-!ELSE
-
-ALL : "$(OUTDIR)\real_features.dll"
-
-!ENDIF
CLEAN :
+ -@erase "$(INTDIR)\real_features.idb"
-@erase "$(INTDIR)\real_features.obj"
- -@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\real_features.dll"
-@erase "$(OUTDIR)\real_features.exp"
-@erase "$(OUTDIR)\real_features.lib"
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\real_features" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /Fp"$(INTDIR)\real_features.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\real_features.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib msi.lib user32.lib wsock32.lib /nologo\
- /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\real_features.pdb"\
- /machine:I386 /out:"$(OUTDIR)\real_features.dll"\
- /implib:"$(OUTDIR)\real_features.lib" /export:ResolveServerName\
- /export:ValidateServerName
+LINK32_FLAGS=kernel32.lib msi.lib user32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\real_features.pdb" /machine:I386 /out:"$(OUTDIR)\real_features.dll" /implib:"$(OUTDIR)\real_features.lib"
LINK32_OBJS= \
"$(INTDIR)\real_features.obj"
@@ -91,20 +104,13 @@
OutDir=.
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\real_features.dll"
-
-!ELSE
-
ALL : "$(OUTDIR)\real_features.dll"
-!ENDIF
CLEAN :
+ -@erase "$(INTDIR)\real_features.idb"
-@erase "$(INTDIR)\real_features.obj"
- -@erase "$(INTDIR)\vc50.idb"
- -@erase "$(INTDIR)\vc50.pdb"
+ -@erase "$(INTDIR)\real_features.pdb"
-@erase "$(OUTDIR)\real_features.dll"
-@erase "$(OUTDIR)\real_features.exp"
-@erase "$(OUTDIR)\real_features.ilk"
@@ -113,65 +119,61 @@
"$(INTDIR)" :
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\real_features.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib msi.lib user32.lib wsock32.lib /nologo\
- /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\real_features.pdb"\
- /debug /machine:I386 /out:"$(OUTDIR)\real_features.dll"\
- /implib:"$(OUTDIR)\real_features.lib" /pdbtype:sept /export:ResolveServerName\
- /export:ValidateServerName
-LINK32_OBJS= \
- "$(INTDIR)\real_features.obj"
-
-"$(OUTDIR)\real_features.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-!ENDIF
+CPP=cl.exe
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\real_features" /FD /c
-.c{$(CPP_OBJS)}.obj::
+.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(CPP_OBJS)}.obj::
+.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cxx{$(CPP_OBJS)}.obj::
+.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.c{$(CPP_SBRS)}.sbr::
+.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(CPP_SBRS)}.sbr::
+.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cxx{$(CPP_SBRS)}.sbr::
+.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\real_features.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib msi.lib user32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\real_features.pdb" /debug /machine:I386 /out:"$(OUTDIR)\real_features.dll" /implib:"$(OUTDIR)\real_features.lib" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\real_features.obj"
+
+"$(OUTDIR)\real_features.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
-!IF "$(CFG)" == "real_features - Win32 Release" || "$(CFG)" ==\
- "real_features - Win32 Debug"
+!IF "$(CFG)" == "real_features - Win32 Release" || "$(CFG)" == "real_features - Win32 Debug"
SOURCE=.\real_features.c
"$(INTDIR)\real_features.obj" : $(SOURCE) "$(INTDIR)"
1.1 httpd-win32-msi/src/.cvsignore
Index: .cvsignore
===================================================================
real_features.dll
real_features.exp
real_features.lib
real_features.plg
real_features.opt
real_features.ncb
Debug
Release
---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org