libapr.mak (apr-1.6.5.tar.bz2) | : | libapr.mak (apr-1.7.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 39 | skipping to change at line 39 | |||
!IF "$(CFG)" == "libapr - Win32 Release" | !IF "$(CFG)" == "libapr - Win32 Release" | |||
OUTDIR=.\Release | OUTDIR=.\Release | |||
INTDIR=.\Release | INTDIR=.\Release | |||
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | |||
# Begin Custom Macros | # Begin Custom Macros | |||
OutDir=.\Release | OutDir=.\Release | |||
# End Custom Macros | # End Custom Macros | |||
ALL : ".\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP )" | ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS _POSTBUILD_DEP)" | |||
CLEAN : | CLEAN : | |||
-@erase "$(INTDIR)\apr_atomic.obj" | -@erase "$(INTDIR)\apr_atomic.obj" | |||
-@erase "$(INTDIR)\apr_atomic64.obj" | ||||
-@erase "$(INTDIR)\apr_cpystrn.obj" | -@erase "$(INTDIR)\apr_cpystrn.obj" | |||
-@erase "$(INTDIR)\apr_cpstr.obj" | -@erase "$(INTDIR)\apr_cpstr.obj" | |||
-@erase "$(INTDIR)\apr_encode.obj" | ||||
-@erase "$(INTDIR)\apr_escape.obj" | -@erase "$(INTDIR)\apr_escape.obj" | |||
-@erase "$(INTDIR)\apr_fnmatch.obj" | -@erase "$(INTDIR)\apr_fnmatch.obj" | |||
-@erase "$(INTDIR)\apr_getpass.obj" | -@erase "$(INTDIR)\apr_getpass.obj" | |||
-@erase "$(INTDIR)\apr_hash.obj" | -@erase "$(INTDIR)\apr_hash.obj" | |||
-@erase "$(INTDIR)\apr_pools.obj" | -@erase "$(INTDIR)\apr_pools.obj" | |||
-@erase "$(INTDIR)\apr_random.obj" | -@erase "$(INTDIR)\apr_random.obj" | |||
-@erase "$(INTDIR)\apr_skiplist.obj" | -@erase "$(INTDIR)\apr_skiplist.obj" | |||
-@erase "$(INTDIR)\apr_snprintf.obj" | -@erase "$(INTDIR)\apr_snprintf.obj" | |||
-@erase "$(INTDIR)\apr_strings.obj" | -@erase "$(INTDIR)\apr_strings.obj" | |||
-@erase "$(INTDIR)\apr_strnatcmp.obj" | -@erase "$(INTDIR)\apr_strnatcmp.obj" | |||
skipping to change at line 132 | skipping to change at line 134 | |||
-@erase "$(OUTDIR)\libapr-1.pdb" | -@erase "$(OUTDIR)\libapr-1.pdb" | |||
-@erase ".\include\apr.h" | -@erase ".\include\apr.h" | |||
-@erase ".\include\apr_gen_test_char.h" | -@erase ".\include\apr_gen_test_char.h" | |||
-@erase "$(OUTDIR)\gen_test_char.exe" | -@erase "$(OUTDIR)\gen_test_char.exe" | |||
-@erase "$(OUTDIR)\gen_test_char.obj" | -@erase "$(OUTDIR)\gen_test_char.obj" | |||
"$(OUTDIR)" : | "$(OUTDIR)" : | |||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |||
CPP=cl.exe | CPP=cl.exe | |||
CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./i nclude/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" / FD /c | CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./i nclude/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" / D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd" $(INTDIR)\libapr_src" /FD /c | |||
.c{$(INTDIR)}.obj:: | .c{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
.cpp{$(INTDIR)}.obj:: | .cpp{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
skipping to change at line 173 | skipping to change at line 175 | |||
MTL=midl.exe | MTL=midl.exe | |||
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |||
RSC=rc.exe | RSC=rc.exe | |||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_V ERSION_ONLY" | RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_V ERSION_ONLY" | |||
BSC32=bscmake.exe | BSC32=bscmake.exe | |||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | |||
BSC32_SBRS= \ | BSC32_SBRS= \ | |||
LINK32=link.exe | LINK32=link.exe | |||
LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref | LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /opt:ref | |||
LINK32_OBJS= \ | LINK32_OBJS= \ | |||
"$(INTDIR)\apr_atomic.obj" \ | "$(INTDIR)\apr_atomic.obj" \ | |||
"$(INTDIR)\apr_atomic64.obj" \ | ||||
"$(INTDIR)\dso.obj" \ | "$(INTDIR)\dso.obj" \ | |||
"$(INTDIR)\apr_encode.obj" \ | ||||
"$(INTDIR)\apr_escape.obj" \ | "$(INTDIR)\apr_escape.obj" \ | |||
"$(INTDIR)\buffer.obj" \ | "$(INTDIR)\buffer.obj" \ | |||
"$(INTDIR)\copy.obj" \ | "$(INTDIR)\copy.obj" \ | |||
"$(INTDIR)\dir.obj" \ | "$(INTDIR)\dir.obj" \ | |||
"$(INTDIR)\fileacc.obj" \ | "$(INTDIR)\fileacc.obj" \ | |||
"$(INTDIR)\filedup.obj" \ | "$(INTDIR)\filedup.obj" \ | |||
"$(INTDIR)\filepath.obj" \ | "$(INTDIR)\filepath.obj" \ | |||
"$(INTDIR)\filepath_util.obj" \ | "$(INTDIR)\filepath_util.obj" \ | |||
"$(INTDIR)\filestat.obj" \ | "$(INTDIR)\filestat.obj" \ | |||
"$(INTDIR)\filesys.obj" \ | "$(INTDIR)\filesys.obj" \ | |||
skipping to change at line 278 | skipping to change at line 282 | |||
!ELSEIF "$(CFG)" == "libapr - Win32 Debug" | !ELSEIF "$(CFG)" == "libapr - Win32 Debug" | |||
OUTDIR=.\Debug | OUTDIR=.\Debug | |||
INTDIR=.\Debug | INTDIR=.\Debug | |||
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | |||
# Begin Custom Macros | # Begin Custom Macros | |||
OutDir=.\Debug | OutDir=.\Debug | |||
# End Custom Macros | # End Custom Macros | |||
ALL : ".\include\apr_escape_test_char.h" ".\Debug\gen_test_char.exe" "$(OUTDIR)\ libapr-1.dll" "$(DS_POSTBUILD_DEP)" | ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS _POSTBUILD_DEP)" | |||
CLEAN : | CLEAN : | |||
-@erase "$(INTDIR)\apr_atomic.obj" | -@erase "$(INTDIR)\apr_atomic.obj" | |||
-@erase "$(INTDIR)\apr_atomic64.obj" | ||||
-@erase "$(INTDIR)\apr_cpystrn.obj" | -@erase "$(INTDIR)\apr_cpystrn.obj" | |||
-@erase "$(INTDIR)\apr_cpstr.obj" | -@erase "$(INTDIR)\apr_cpstr.obj" | |||
-@erase "$(INTDIR)\apr_encode.obj" | ||||
-@erase "$(INTDIR)\apr_escape.obj" | -@erase "$(INTDIR)\apr_escape.obj" | |||
-@erase "$(INTDIR)\apr_fnmatch.obj" | -@erase "$(INTDIR)\apr_fnmatch.obj" | |||
-@erase "$(INTDIR)\apr_getpass.obj" | -@erase "$(INTDIR)\apr_getpass.obj" | |||
-@erase "$(INTDIR)\apr_hash.obj" | -@erase "$(INTDIR)\apr_hash.obj" | |||
-@erase "$(INTDIR)\apr_pools.obj" | -@erase "$(INTDIR)\apr_pools.obj" | |||
-@erase "$(INTDIR)\apr_random.obj" | -@erase "$(INTDIR)\apr_random.obj" | |||
-@erase "$(INTDIR)\apr_skiplist.obj" | -@erase "$(INTDIR)\apr_skiplist.obj" | |||
-@erase "$(INTDIR)\apr_snprintf.obj" | -@erase "$(INTDIR)\apr_snprintf.obj" | |||
-@erase "$(INTDIR)\apr_strings.obj" | -@erase "$(INTDIR)\apr_strings.obj" | |||
-@erase "$(INTDIR)\apr_strnatcmp.obj" | -@erase "$(INTDIR)\apr_strnatcmp.obj" | |||
skipping to change at line 371 | skipping to change at line 377 | |||
-@erase "$(OUTDIR)\libapr-1.pdb" | -@erase "$(OUTDIR)\libapr-1.pdb" | |||
-@erase ".\include\apr.h" | -@erase ".\include\apr.h" | |||
-@erase ".\include\apr_gen_test_char.h" | -@erase ".\include\apr_gen_test_char.h" | |||
-@erase "$(OUTDIR)\gen_test_char.exe" | -@erase "$(OUTDIR)\gen_test_char.exe" | |||
-@erase "$(OUTDIR)\gen_test_char.obj" | -@erase "$(OUTDIR)\gen_test_char.obj" | |||
"$(OUTDIR)" : | "$(OUTDIR)" : | |||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |||
CPP=cl.exe | CPP=cl.exe | |||
CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./inclu de/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D " WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD / EHsc /c | CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./inclu de/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "A PR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(IN TDIR)\libapr_src" /FD /EHsc /c | |||
.c{$(INTDIR)}.obj:: | .c{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
.cpp{$(INTDIR)}.obj:: | .cpp{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
skipping to change at line 412 | skipping to change at line 418 | |||
MTL=midl.exe | MTL=midl.exe | |||
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |||
RSC=rc.exe | RSC=rc.exe | |||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_V ERSION_ONLY" | RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_V ERSION_ONLY" | |||
BSC32=bscmake.exe | BSC32=bscmake.exe | |||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | |||
BSC32_SBRS= \ | BSC32_SBRS= \ | |||
LINK32=link.exe | LINK32=link.exe | |||
LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /MACHINE:X86 | LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" | |||
LINK32_OBJS= \ | LINK32_OBJS= \ | |||
"$(INTDIR)\apr_atomic.obj" \ | "$(INTDIR)\apr_atomic.obj" \ | |||
"$(INTDIR)\apr_atomic64.obj" \ | ||||
"$(INTDIR)\dso.obj" \ | "$(INTDIR)\dso.obj" \ | |||
"$(INTDIR)\apr_encode.obj" \ | ||||
"$(INTDIR)\apr_escape.obj" \ | "$(INTDIR)\apr_escape.obj" \ | |||
"$(INTDIR)\buffer.obj" \ | "$(INTDIR)\buffer.obj" \ | |||
"$(INTDIR)\copy.obj" \ | "$(INTDIR)\copy.obj" \ | |||
"$(INTDIR)\dir.obj" \ | "$(INTDIR)\dir.obj" \ | |||
"$(INTDIR)\fileacc.obj" \ | "$(INTDIR)\fileacc.obj" \ | |||
"$(INTDIR)\filedup.obj" \ | "$(INTDIR)\filedup.obj" \ | |||
"$(INTDIR)\filepath.obj" \ | "$(INTDIR)\filepath.obj" \ | |||
"$(INTDIR)\filepath_util.obj" \ | "$(INTDIR)\filepath_util.obj" \ | |||
"$(INTDIR)\filestat.obj" \ | "$(INTDIR)\filestat.obj" \ | |||
"$(INTDIR)\filesys.obj" \ | "$(INTDIR)\filesys.obj" \ | |||
skipping to change at line 517 | skipping to change at line 525 | |||
!ELSEIF "$(CFG)" == "libapr - x64 Release" | !ELSEIF "$(CFG)" == "libapr - x64 Release" | |||
OUTDIR=.\x64\Release | OUTDIR=.\x64\Release | |||
INTDIR=.\x64\Release | INTDIR=.\x64\Release | |||
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | |||
# Begin Custom Macros | # Begin Custom Macros | |||
OutDir=.\x64\Release | OutDir=.\x64\Release | |||
# End Custom Macros | # End Custom Macros | |||
ALL : ".\x64\Release\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OU TDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" | ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS _POSTBUILD_DEP)" | |||
CLEAN : | CLEAN : | |||
-@erase "$(INTDIR)\apr_atomic.obj" | -@erase "$(INTDIR)\apr_atomic.obj" | |||
-@erase "$(INTDIR)\apr_atomic64.obj" | ||||
-@erase "$(INTDIR)\apr_cpystrn.obj" | -@erase "$(INTDIR)\apr_cpystrn.obj" | |||
-@erase "$(INTDIR)\apr_cpstr.obj" | -@erase "$(INTDIR)\apr_cpstr.obj" | |||
-@erase "$(INTDIR)\apr_encode.obj" | ||||
-@erase "$(INTDIR)\apr_escape.obj" | -@erase "$(INTDIR)\apr_escape.obj" | |||
-@erase "$(INTDIR)\apr_fnmatch.obj" | -@erase "$(INTDIR)\apr_fnmatch.obj" | |||
-@erase "$(INTDIR)\apr_getpass.obj" | -@erase "$(INTDIR)\apr_getpass.obj" | |||
-@erase "$(INTDIR)\apr_hash.obj" | -@erase "$(INTDIR)\apr_hash.obj" | |||
-@erase "$(INTDIR)\apr_pools.obj" | -@erase "$(INTDIR)\apr_pools.obj" | |||
-@erase "$(INTDIR)\apr_random.obj" | -@erase "$(INTDIR)\apr_random.obj" | |||
-@erase "$(INTDIR)\apr_skiplist.obj" | -@erase "$(INTDIR)\apr_skiplist.obj" | |||
-@erase "$(INTDIR)\apr_snprintf.obj" | -@erase "$(INTDIR)\apr_snprintf.obj" | |||
-@erase "$(INTDIR)\apr_strings.obj" | -@erase "$(INTDIR)\apr_strings.obj" | |||
-@erase "$(INTDIR)\apr_strnatcmp.obj" | -@erase "$(INTDIR)\apr_strnatcmp.obj" | |||
skipping to change at line 610 | skipping to change at line 620 | |||
-@erase "$(OUTDIR)\libapr-1.pdb" | -@erase "$(OUTDIR)\libapr-1.pdb" | |||
-@erase ".\include\apr.h" | -@erase ".\include\apr.h" | |||
-@erase ".\include\apr_gen_test_char.h" | -@erase ".\include\apr_gen_test_char.h" | |||
-@erase "$(OUTDIR)\gen_test_char.exe" | -@erase "$(OUTDIR)\gen_test_char.exe" | |||
-@erase "$(OUTDIR)\gen_test_char.obj" | -@erase "$(OUTDIR)\gen_test_char.obj" | |||
"$(OUTDIR)" : | "$(OUTDIR)" : | |||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |||
CPP=cl.exe | CPP=cl.exe | |||
CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./i nclude/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" / FD /c | CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "./include/arch" /I "./i nclude/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "NDEBUG" / D "APR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd" $(INTDIR)\libapr_src" /FD /c | |||
.c{$(INTDIR)}.obj:: | .c{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
.cpp{$(INTDIR)}.obj:: | .cpp{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
skipping to change at line 651 | skipping to change at line 661 | |||
MTL=midl.exe | MTL=midl.exe | |||
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" | |||
RSC=rc.exe | RSC=rc.exe | |||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_V ERSION_ONLY" | RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "NDEBUG" /d "APR_V ERSION_ONLY" | |||
BSC32=bscmake.exe | BSC32=bscmake.exe | |||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | |||
BSC32_SBRS= \ | BSC32_SBRS= \ | |||
LINK32=link.exe | LINK32=link.exe | |||
LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /MACHINE:X64 /opt:ref | LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /opt:ref | |||
LINK32_OBJS= \ | LINK32_OBJS= \ | |||
"$(INTDIR)\apr_atomic.obj" \ | "$(INTDIR)\apr_atomic.obj" \ | |||
"$(INTDIR)\apr_atomic64.obj" \ | ||||
"$(INTDIR)\dso.obj" \ | "$(INTDIR)\dso.obj" \ | |||
"$(INTDIR)\apr_encode.obj" \ | ||||
"$(INTDIR)\apr_escape.obj" \ | "$(INTDIR)\apr_escape.obj" \ | |||
"$(INTDIR)\buffer.obj" \ | "$(INTDIR)\buffer.obj" \ | |||
"$(INTDIR)\copy.obj" \ | "$(INTDIR)\copy.obj" \ | |||
"$(INTDIR)\dir.obj" \ | "$(INTDIR)\dir.obj" \ | |||
"$(INTDIR)\fileacc.obj" \ | "$(INTDIR)\fileacc.obj" \ | |||
"$(INTDIR)\filedup.obj" \ | "$(INTDIR)\filedup.obj" \ | |||
"$(INTDIR)\filepath.obj" \ | "$(INTDIR)\filepath.obj" \ | |||
"$(INTDIR)\filepath_util.obj" \ | "$(INTDIR)\filepath_util.obj" \ | |||
"$(INTDIR)\filestat.obj" \ | "$(INTDIR)\filestat.obj" \ | |||
"$(INTDIR)\filesys.obj" \ | "$(INTDIR)\filesys.obj" \ | |||
skipping to change at line 756 | skipping to change at line 768 | |||
!ELSEIF "$(CFG)" == "libapr - x64 Debug" | !ELSEIF "$(CFG)" == "libapr - x64 Debug" | |||
OUTDIR=.\x64\Debug | OUTDIR=.\x64\Debug | |||
INTDIR=.\x64\Debug | INTDIR=.\x64\Debug | |||
DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep | |||
# Begin Custom Macros | # Begin Custom Macros | |||
OutDir=.\x64\Debug | OutDir=.\x64\Debug | |||
# End Custom Macros | # End Custom Macros | |||
ALL : ".\x64\Debug\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OUTD IR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" | ALL : ".\include\apr.hw" ".\include\apr_escape.h" "$(OUTDIR)\libapr-1.dll" "$(DS _POSTBUILD_DEP)" | |||
CLEAN : | CLEAN : | |||
-@erase "$(INTDIR)\apr_atomic.obj" | -@erase "$(INTDIR)\apr_atomic.obj" | |||
-@erase "$(INTDIR)\apr_atomic64.obj" | ||||
-@erase "$(INTDIR)\apr_cpystrn.obj" | -@erase "$(INTDIR)\apr_cpystrn.obj" | |||
-@erase "$(INTDIR)\apr_cpstr.obj" | -@erase "$(INTDIR)\apr_cpstr.obj" | |||
-@erase "$(INTDIR)\apr_encode.obj" | ||||
-@erase "$(INTDIR)\apr_escape.obj" | -@erase "$(INTDIR)\apr_escape.obj" | |||
-@erase "$(INTDIR)\apr_fnmatch.obj" | -@erase "$(INTDIR)\apr_fnmatch.obj" | |||
-@erase "$(INTDIR)\apr_getpass.obj" | -@erase "$(INTDIR)\apr_getpass.obj" | |||
-@erase "$(INTDIR)\apr_hash.obj" | -@erase "$(INTDIR)\apr_hash.obj" | |||
-@erase "$(INTDIR)\apr_pools.obj" | -@erase "$(INTDIR)\apr_pools.obj" | |||
-@erase "$(INTDIR)\apr_random.obj" | -@erase "$(INTDIR)\apr_random.obj" | |||
-@erase "$(INTDIR)\apr_skiplist.obj" | -@erase "$(INTDIR)\apr_skiplist.obj" | |||
-@erase "$(INTDIR)\apr_snprintf.obj" | -@erase "$(INTDIR)\apr_snprintf.obj" | |||
-@erase "$(INTDIR)\apr_strings.obj" | -@erase "$(INTDIR)\apr_strings.obj" | |||
-@erase "$(INTDIR)\apr_strnatcmp.obj" | -@erase "$(INTDIR)\apr_strnatcmp.obj" | |||
skipping to change at line 849 | skipping to change at line 863 | |||
-@erase "$(OUTDIR)\libapr-1.pdb" | -@erase "$(OUTDIR)\libapr-1.pdb" | |||
-@erase ".\include\apr.h" | -@erase ".\include\apr.h" | |||
-@erase ".\include\apr_gen_test_char.h" | -@erase ".\include\apr_gen_test_char.h" | |||
-@erase "$(OUTDIR)\gen_test_char.exe" | -@erase "$(OUTDIR)\gen_test_char.exe" | |||
-@erase "$(OUTDIR)\gen_test_char.obj" | -@erase "$(OUTDIR)\gen_test_char.obj" | |||
"$(OUTDIR)" : | "$(OUTDIR)" : | |||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" | |||
CPP=cl.exe | CPP=cl.exe | |||
CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./inclu de/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D " WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libapr_src" /FD / EHsc /c | CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "./include/arch" /I "./inclu de/arch/win32" /I "./include/arch/unix" /I "./include/private" /D "_DEBUG" /D "A PR_DECLARE_EXPORT" /D "WIN32" /D "WINNT" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(IN TDIR)\libapr_src" /FD /EHsc /c | |||
.c{$(INTDIR)}.obj:: | .c{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
.cpp{$(INTDIR)}.obj:: | .cpp{$(INTDIR)}.obj:: | |||
$(CPP) @<< | $(CPP) @<< | |||
$(CPP_PROJ) $< | $(CPP_PROJ) $< | |||
<< | << | |||
skipping to change at line 890 | skipping to change at line 904 | |||
MTL=midl.exe | MTL=midl.exe | |||
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" | |||
RSC=rc.exe | RSC=rc.exe | |||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_V ERSION_ONLY" | RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libapr.res" /i "./include" /d "_DEBUG" /d "APR_V ERSION_ONLY" | |||
BSC32=bscmake.exe | BSC32=bscmake.exe | |||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr.bsc" | |||
BSC32_SBRS= \ | BSC32_SBRS= \ | |||
LINK32=link.exe | LINK32=link.exe | |||
LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" /MACHINE:X64 | LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32. lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:n o /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$( OUTDIR)\libapr-1.lib" | |||
LINK32_OBJS= \ | LINK32_OBJS= \ | |||
"$(INTDIR)\apr_atomic.obj" \ | "$(INTDIR)\apr_atomic.obj" \ | |||
"$(INTDIR)\apr_atomic64.obj" \ | ||||
"$(INTDIR)\dso.obj" \ | "$(INTDIR)\dso.obj" \ | |||
"$(INTDIR)\apr_encode.obj" \ | ||||
"$(INTDIR)\apr_escape.obj" \ | "$(INTDIR)\apr_escape.obj" \ | |||
"$(INTDIR)\buffer.obj" \ | "$(INTDIR)\buffer.obj" \ | |||
"$(INTDIR)\copy.obj" \ | "$(INTDIR)\copy.obj" \ | |||
"$(INTDIR)\dir.obj" \ | "$(INTDIR)\dir.obj" \ | |||
"$(INTDIR)\fileacc.obj" \ | "$(INTDIR)\fileacc.obj" \ | |||
"$(INTDIR)\filedup.obj" \ | "$(INTDIR)\filedup.obj" \ | |||
"$(INTDIR)\filepath.obj" \ | "$(INTDIR)\filepath.obj" \ | |||
"$(INTDIR)\filepath_util.obj" \ | "$(INTDIR)\filepath_util.obj" \ | |||
"$(INTDIR)\filestat.obj" \ | "$(INTDIR)\filestat.obj" \ | |||
"$(INTDIR)\filesys.obj" \ | "$(INTDIR)\filesys.obj" \ | |||
skipping to change at line 1002 | skipping to change at line 1018 | |||
!MESSAGE Warning: cannot find "libapr.dep" | !MESSAGE Warning: cannot find "libapr.dep" | |||
!ENDIF | !ENDIF | |||
!ENDIF | !ENDIF | |||
!IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" | | "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug" | !IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" | | "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug" | |||
SOURCE=.\atomic\win32\apr_atomic.c | SOURCE=.\atomic\win32\apr_atomic.c | |||
"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | "$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | |||
$(CPP) $(CPP_PROJ) $(SOURCE) | $(CPP) $(CPP_PROJ) $(SOURCE) | |||
SOURCE=.\atomic\win32\apr_atomic64.c | ||||
"$(INTDIR)\apr_atomic64.obj" : $(SOURCE) "$(INTDIR)" | ||||
$(CPP) $(CPP_PROJ) $(SOURCE) | ||||
SOURCE=.\dso\win32\dso.c | SOURCE=.\dso\win32\dso.c | |||
"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | "$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | |||
$(CPP) $(CPP_PROJ) $(SOURCE) | $(CPP) $(CPP_PROJ) $(SOURCE) | |||
SOURCE=.\encoding\apr_encode.c | ||||
"$(INTDIR)\apr_encode.obj" : $(SOURCE) "$(INTDIR)" | ||||
$(CPP) $(CPP_PROJ) $(SOURCE) | ||||
SOURCE=.\encoding\apr_escape.c | SOURCE=.\encoding\apr_escape.c | |||
"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\i nclude\apr_escape_test_char.h" ".\include\apr.h" | "$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\i nclude\apr_escape_test_char.h" ".\include\apr.h" | |||
$(CPP) $(CPP_PROJ) $(SOURCE) | $(CPP) $(CPP_PROJ) $(SOURCE) | |||
SOURCE=.\file_io\win32\buffer.c | SOURCE=.\file_io\win32\buffer.c | |||
"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | "$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | |||
$(CPP) $(CPP_PROJ) $(SOURCE) | $(CPP) $(CPP_PROJ) $(SOURCE) | |||
skipping to change at line 1482 | skipping to change at line 1508 | |||
"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | "$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | |||
<<tempfile.bat | <<tempfile.bat | |||
@echo off | @echo off | |||
cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MB CS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char .exe .\tools\gen_test_char.c | cl.exe /nologo /W3 /EHsc /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MB CS" /FD /I ".\include" /Fo.\x64\Debug\gen_test_char /Fe.\x64\Debug\gen_test_char .exe .\tools\gen_test_char.c | |||
.\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h | .\x64\Debug\gen_test_char.exe > .\include\apr_escape_test_char.h | |||
<< | << | |||
!ENDIF | !ENDIF | |||
SOURCE=.\include\apr_want.h | ||||
!IF "$(CFG)" == "libapr - Win32 Release" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ELSEIF "$(CFG)" == "libapr - Win32 Debug" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ELSEIF "$(CFG)" == "libapr - x64 Release" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ELSEIF "$(CFG)" == "libapr - x64 Debug" | ||||
InputPath=.\include\apr_want.h | ||||
".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" | ||||
<<tempfile.bat | ||||
@echo off | ||||
type .\include\apr.hw > .\include\apr.h | ||||
<< | ||||
!ENDIF | ||||
SOURCE=.\libapr.rc | SOURCE=.\libapr.rc | |||
"$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | "$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" | |||
$(RSC) $(RSC_PROJ) $(SOURCE) | $(RSC) $(RSC_PROJ) $(SOURCE) | |||
!ENDIF | !ENDIF | |||
End of changes. 31 change blocks. | ||||
76 lines changed or deleted | 38 lines changed or added |