Author: rjung
Date: Sun May 24 17:05:36 2015
New Revision: 1681494
URL: http://svn.apache.org/r1681494
Log:
Sync Windows build files with 1.1:
- remove TCN_DECLARE_EXPORT. it had been axed in
r1292841
- use same srclib path for apr and openssl like
in 1.1
Modified:
tomcat/native/trunk/native/libtcnative.dsp
tomcat/native/trunk/native/tcnative.dsp
Modified: tomcat/native/trunk/native/libtcnative.dsp
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=1681494&r1=1681493&r2=1681494&view=diff
==============================================================================
--- tomcat/native/trunk/native/libtcnative.dsp (original)
+++ tomcat/native/trunk/native/libtcnative.dsp Sun May 24 17:05:36 2015
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D "NO_RC5" /D
"NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D
"HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Release\libtcnative_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I
"./srclib/apr/include" /I "./srclib/apr/include/arch/win32" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I
"./srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D
"NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D
"OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
/Fd"Release\libtcnative_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"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"Release/libtcnative-2.dll" /libpath:"../openssl/out32"
/libpath:"../openssl/out32dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"Release/libtcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "libtcnative - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe
# 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 /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D "NO_RC5" /D
"NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D
"HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Debug\libtcnative_src" /FD /c
+# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I
"./srclib/apr/include" /I "./srclib/apr/include/arch/win32" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I
"./srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D
"NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D
"OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
/Fd"Debug\libtcnative_src" /FD /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"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/libtcnative-2.dll" /libpath:"../openssl/out32"
/libpath:"../openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/libtcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
Modified: tomcat/native/trunk/native/tcnative.dsp
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=1681494&r1=1681493&r2=1681494&view=diff
==============================================================================
--- tomcat/native/trunk/native/tcnative.dsp (original)
+++ tomcat/native/trunk/native/tcnative.dsp Sun May 24 17:05:36 2015
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D
"NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D
"OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
/Fd"LibR\tcnative_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I
"./srclib/apr/include" /I "./srclib/apr/include/arch/win32" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I
"./srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APR_DECLARE_STATIC" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA"
/D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D
HAVE_SSL_SET_STATE=1 /Fd"LibR\tcnative_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"
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"LibR/tcnative-2.dll" /libpath:"../openssl/out32"
/libpath:"../openssl/out32dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386
/out:"LibR/tcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe
# 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 /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D
"NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D
"OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
/Fd"LibD\tcnative_src" /FD /c
+# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I
"./srclib/apr/include" /I "./srclib/apr/include/arch/win32" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I
"./srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APR_DECLARE_STATIC" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA"
/D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D
HAVE_SSL_SET_STATE=1 /Fd"LibD\tcnative_src" /FD /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"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows
/dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"LibD/tcnative-2.dll" /libpath:"../openssl/out32"
/libpath:"../openssl/out32dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"LibD/tcnative-2.dll" /libpath:"./srclib/openssl/out32"
/libpath:"./srclib/openssl/out32dll"
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
