[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r1688706 - in /apr/apr-util/branches/1.5.x: dbd/apr_dbd_mysql.dsp dbd/apr_dbd_mysql.mak 
From:       gsmith () apache ! org
Date:       2015-07-01 18:49:44
Message-ID: 20150701184944.D2222AC006B () hades ! apache ! org
[Download RAW message or body]

Author: gsmith
Date: Wed Jul  1 18:49:44 2015
New Revision: 1688706

URL: http://svn.apache.org/r1688706
Log:
backport r1687654 
add paths for additional dependencies in some dbd/dbm projects
same changes to .mak files not in trunk

Modified:
    apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.dsp
    apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.mak
    apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.dsp
    apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.mak
    apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.dsp
    apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.mak

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.dsp?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.dsp (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.dsp Wed Jul  1 18:49:44 2015
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c  # ADD BASE \
MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "NDEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
                /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/out:"Release\apr_dbd_mysql-1.dll" /pdb:"Release\apr_dbd_mysql-1.pdb" \
/implib:"Release\apr_dbd_mysql-1.lib" /MACHINE:X86 /opt:ref +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/libpath:"..\..\mysql\lib" /out:"Release\apr_dbd_mysql-1.dll" \
/pdb:"Release\apr_dbd_mysql-1.pdb" /implib:"Release\apr_dbd_mysql-1.lib" /MACHINE:X86 \
/opt:ref  # Begin Special Build Tool
 TargetPath=Release\apr_dbd_mysql-1.dll
 SOURCE="$(InputPath)"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c  # ADD \
BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -86,8 +86,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
                /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/out:"Debug\apr_dbd_mysql-1.dll" /pdb:"Debug\apr_dbd_mysql-1.pdb" \
/implib:"Debug\apr_dbd_mysql-1.lib" /MACHINE:X86 +# ADD BASE LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/libpath:"..\..\mysql\lib" /out:"Debug\apr_dbd_mysql-1.dll" \
/pdb:"Debug\apr_dbd_mysql-1.pdb" /implib:"Debug\apr_dbd_mysql-1.lib" /MACHINE:X86  # \
Begin Special Build Tool  TargetPath=Debug\apr_dbd_mysql-1.dll
 SOURCE="$(InputPath)"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c  # ADD BASE \
MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "NDEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
                /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Release\apr_dbd_mysql-1.dll" /pdb:"x64\Release\apr_dbd_mysql-1.pdb" \
/implib:"x64\Release\apr_dbd_mysql-1.lib" /MACHINE:X64 /opt:ref +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/libpath:"..\..\mysql\lib" /out:"x64\Release\apr_dbd_mysql-1.dll" \
/pdb:"x64\Release\apr_dbd_mysql-1.pdb" /implib:"x64\Release\apr_dbd_mysql-1.lib" \
/MACHINE:X64 /opt:ref  # Begin Special Build Tool
 TargetPath=x64\Release\apr_dbd_mysql-1.dll
 SOURCE="$(InputPath)"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c  # ADD \
BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -150,8 +150,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libmysql.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
                /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Debug\apr_dbd_mysql-1.dll" /pdb:"x64\Debug\apr_dbd_mysql-1.pdb" \
/implib:"x64\Debug\apr_dbd_mysql-1.lib" /MACHINE:X64 +# ADD BASE LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug \
/libpath:"..\..\mysql\lib" /out:"x64\Debug\apr_dbd_mysql-1.dll" \
/pdb:"x64\Debug\apr_dbd_mysql-1.pdb" /implib:"x64\Debug\apr_dbd_mysql-1.lib" \
/MACHINE:X64  # Begin Special Build Tool
 TargetPath=x64\Debug\apr_dbd_mysql-1.dll
 SOURCE="$(InputPath)"

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.mak?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.mak (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_mysql.mak Wed Jul  1 18:49:44 2015
@@ -64,7 +64,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c  +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -105,7 +105,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X86 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" \
/MACHINE:X86 /opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_mysql.obj" \
 	"$(INTDIR)\apr_dbd_mysql-1.res" \
@@ -167,7 +167,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -208,7 +208,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X86  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X86   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_mysql.obj" \
 	"$(INTDIR)\apr_dbd_mysql-1.res" \
@@ -270,7 +270,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c  +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -311,7 +311,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\mysql\lib" /pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbd_mysql-1.dll" /implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" \
/MACHINE:X64 /opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_mysql.obj" \
 	"$(INTDIR)\apr_dbd_mysql-1.res" \
@@ -373,7 +373,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../mysql/include" \
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_MYSQL=1 /D \
"HAVE_MYSQL_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -414,7 +414,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysql.lib \
/nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libmysqld.lib /nologo \
/base:"0x6EF50000" /subsystem:windows /dll /incremental:no /libpath:"..\..\mysql\lib" \
/pdb:"$(OUTDIR)\apr_dbd_mysql-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_mysql-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_mysql-1.lib" /MACHINE:X64   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_mysql.obj" \
 	"$(INTDIR)\apr_dbd_mysql-1.res" \

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.dsp?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.dsp (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.dsp Wed Jul  1 18:49:44 2015
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c +# \
ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c  # ADD BASE MTL /nologo /D "NDEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 \
"NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
                /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
/out:"Release\apr_dbd_sqlite3-1.dll" /pdb:"Release\apr_dbd_sqlite3-1.pdb" \
/implib:"Release\apr_dbd_sqlite3-1.lib" /MACHINE:X86 /opt:ref +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo \
/base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
/libpath:"..\..\sqlite3" /out:"Release\apr_dbd_sqlite3-1.dll" \
/pdb:"Release\apr_dbd_sqlite3-1.pdb" /implib:"Release\apr_dbd_sqlite3-1.lib" \
/MACHINE:X86 /opt:ref  # Begin Special Build Tool
 TargetPath=Release\apr_dbd_sqlite3-1.dll
 SOURCE="$(InputPath)"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c \
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c  # ADD BASE MTL /nologo /D "_DEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 \
"NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -87,7 +87,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
                sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll \
                /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
/out:"Debug\apr_dbd_sqlite3-1.dll" /pdb:"Debug\apr_dbd_sqlite3-1.pdb" \
/implib:"Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X86 +# ADD LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" \
/subsystem:windows /dll /incremental:no /debug /libpath:"..\..\sqlite3" \
/out:"Debug\apr_dbd_sqlite3-1.dll" /pdb:"Debug\apr_dbd_sqlite3-1.pdb" \
/implib:"Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X86  # Begin Special Build Tool
 TargetPath=Debug\apr_dbd_sqlite3-1.dll
 SOURCE="$(InputPath)"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c +# \
ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c  # ADD BASE MTL /nologo /D "NDEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 \
"NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
                /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Release\apr_dbd_sqlite3-1.dll" /pdb:"x64\Release\apr_dbd_sqlite3-1.pdb" \
/implib:"x64\Release\apr_dbd_sqlite3-1.lib" /MACHINE:X64 /opt:ref +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo \
/base:"0x6EF20000" /subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" \
/debug /out:"x64\Release\apr_dbd_sqlite3-1.dll" \
/pdb:"x64\Release\apr_dbd_sqlite3-1.pdb" /implib:"x64\Release\apr_dbd_sqlite3-1.lib" \
/MACHINE:X64 /opt:ref  # Begin Special Build Tool
 TargetPath=x64\Release\apr_dbd_sqlite3-1.dll
 SOURCE="$(InputPath)"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c \
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c  # ADD BASE MTL /nologo /D "_DEBUG" \
/mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 \
"NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -151,7 +151,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
                sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll \
                /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Debug\apr_dbd_sqlite3-1.dll" /pdb:"x64\Debug\apr_dbd_sqlite3-1.pdb" \
/implib:"x64\Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X64 +# ADD LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" /debug \
/out:"x64\Debug\apr_dbd_sqlite3-1.dll" /pdb:"x64\Debug\apr_dbd_sqlite3-1.pdb" \
/implib:"x64\Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X64  # Begin Special Build Tool
 TargetPath=x64\Debug\apr_dbd_sqlite3-1.dll
 SOURCE="$(InputPath)"

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.mak?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.mak (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd_sqlite3.mak Wed Jul  1 18:49:44 2015
@@ -64,7 +64,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c  \
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -105,7 +105,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X86 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" \
/MACHINE:X86 /opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_sqlite3.obj" \
 	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
@@ -167,7 +167,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc \
/c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -208,7 +208,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X86  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X86   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_sqlite3.obj" \
 	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
@@ -270,7 +270,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c  \
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -311,7 +311,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\sqlite3" /pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" /implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" \
/MACHINE:X64 /opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_sqlite3.obj" \
 	"$(INTDIR)\apr_dbd_sqlite3-1.res" \
@@ -373,7 +373,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc \
/c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /I "../../sqlite3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D \
"APU_DSO_MODULE_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -414,7 +414,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbd
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib \
/nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\sqlite3" \
/pdb:"$(OUTDIR)\apr_dbd_sqlite3-1.pdb" /debug /out:"$(OUTDIR)\apr_dbd_sqlite3-1.dll" \
/implib:"$(OUTDIR)\apr_dbd_sqlite3-1.lib" /MACHINE:X64   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbd_sqlite3.obj" \
 	"$(INTDIR)\apr_dbd_sqlite3-1.res" \

Modified: apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.dsp?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.dsp (original)
+++ apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.dsp Wed Jul  1 18:49:44 2015
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c  # ADD \
BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
                /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
/out:"Release\apr_dbm_db-1.dll" /pdb:"Release\apr_dbm_db-1.pdb" \
/implib:"Release\apr_dbm_db-1.lib" /MACHINE:X86 /opt:ref +# ADD LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\db" /debug \
/out:"Release\apr_dbm_db-1.dll" /pdb:"Release\apr_dbm_db-1.pdb" \
/implib:"Release\apr_dbm_db-1.lib" /MACHINE:X86 /opt:ref  # Begin Special Build Tool
 TargetPath=Release\apr_dbm_db-1.dll
 SOURCE="$(InputPath)"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c  # \
ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -87,7 +87,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
                libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll \
                /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
/out:"Debug\apr_dbm_db-1.dll" /pdb:"Debug\apr_dbm_db-1.pdb" \
/implib:"Debug\apr_dbm_db-1.lib" /MACHINE:X86 +# ADD LINK32 kernel32.lib advapi32.lib \
ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\db" /debug \
/out:"Debug\apr_dbm_db-1.dll" /pdb:"Debug\apr_dbm_db-1.pdb" \
/implib:"Debug\apr_dbm_db-1.lib" /MACHINE:X86  # Begin Special Build Tool
 TargetPath=Debug\apr_dbm_db-1.dll
 SOURCE="$(InputPath)"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # 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 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c  # ADD \
BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"NDEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
                /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Release\apr_dbm_db-1.dll" /pdb:"x64\Release\apr_dbm_db-1.pdb" \
/implib:"x64\Release\apr_dbm_db-1.lib" /MACHINE:X64 /opt:ref +# ADD LINK32 \
kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo \
/base:"0x6F000000" /subsystem:windows /dll /incremental:no /libpath:"..\..\db" /debug \
/out:"x64\Release\apr_dbm_db-1.dll" /pdb:"x64\Release\apr_dbm_db-1.pdb" \
/implib:"x64\Release\apr_dbm_db-1.lib" /MACHINE:X64 /opt:ref  # Begin Special Build \
Tool  TargetPath=x64\Release\apr_dbm_db-1.dll
 SOURCE="$(InputPath)"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD \
                /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c  # \
ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD MTL /nologo /D \
"_DEBUG" /mktyplib203 /o /win32 "NUL"  # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -151,7 +151,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib \
                libdb47.lib /nologo /base:"0x6F000000" /subsystem:windows /dll \
                /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no /debug \
/out:"x64\Debug\apr_dbm_db-1.dll" /pdb:"x64\Debug\apr_dbm_db-1.pdb" \
/implib:"x64\Debug\apr_dbm_db-1.lib" /MACHINE:X64 +# ADD LINK32 kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\db" /debug \
/out:"x64\Debug\apr_dbm_db-1.dll" /pdb:"x64\Debug\apr_dbm_db-1.pdb" \
/implib:"x64\Debug\apr_dbm_db-1.lib" /MACHINE:X64  # Begin Special Build Tool
 TargetPath=x64\Debug\apr_dbm_db-1.dll
 SOURCE="$(InputPath)"

Modified: apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.mak?rev=1688706&r1=1688705&r2=1688706&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.mak (original)
+++ apr/apr-util/branches/1.5.x/dbm/apr_dbm_db.mak Wed Jul  1 18:49:44 2015
@@ -64,7 +64,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /c  +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -105,7 +105,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86 \
/opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
 	"$(INTDIR)\apr_dbm_db-1.res" \
@@ -167,7 +167,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -208,7 +208,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\db" \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X86   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
 	"$(INTDIR)\apr_dbm_db-1.res" \
@@ -270,7 +270,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I \
"../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /c  +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "NDEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -311,7 +311,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 /opt:ref  \
+LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/libpath:"..\..\db" /pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug \
/out:"$(OUTDIR)\apr_dbm_db-1.dll" /implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64 \
/opt:ref   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
 	"$(INTDIR)\apr_dbm_db-1.res" \
@@ -373,7 +373,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I \
"../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" \
/D APU_HAVE_DB=1 /D APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" \
/Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c  +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I \
"../include" /I "../../apr/include" /I "../include/private" /I "../../db" /D "_DEBUG" \
/D "WIN32" /D "_WINDOWS" /D "APU_DSO_MODULE_BUILD" /D APU_HAVE_DB=1 /D \
APU_HAVE_DB_VERSION=4 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_dbm_db_src" /FD /EHsc /c   
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -414,7 +414,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_dbm
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib \
/nologo /base:"0x6F000000" /subsystem:windows /dll /incremental:no \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64  +LINK32_FLAGS=kernel32.lib \
advapi32.lib ws2_32.lib mswsock.lib ole32.lib libdb47.lib /nologo /base:"0x6F000000" \
/subsystem:windows /dll /incremental:no /libpath:"..\..\db" \
/pdb:"$(OUTDIR)\apr_dbm_db-1.pdb" /debug /out:"$(OUTDIR)\apr_dbm_db-1.dll" \
/implib:"$(OUTDIR)\apr_dbm_db-1.lib" /MACHINE:X64   LINK32_OBJS= \
 	"$(INTDIR)\apr_dbm_berkeleydb.obj" \
 	"$(INTDIR)\apr_dbm_db-1.res" \


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic