mturk 2005/01/17 10:27:47
Modified: jni/native libtcnative.dsp libtcnative.dsw tcnative.dsp
Log:
Update build files for WIN32 allowing static APR build
Revision Changes Path
1.3 +2 -2 jakarta-tomcat-connectors/jni/native/libtcnative.dsp
Index: libtcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtcnative.dsp 17 Jan 2005 07:17:06 -0000 1.2
+++ libtcnative.dsp 17 Jan 2005 18:27:47 -0000 1.3
@@ -43,7 +43,7 @@
# 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 /I "./include" /I "../apr/include" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\libtcnative_src" /FD
/c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D
"_WINDOWS" /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"
@@ -69,7 +69,7 @@
# 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
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libtcnative_src" /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" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D
"_WINDOWS" /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"
1.3 +27 -0 jakarta-tomcat-connectors/jni/native/libtcnative.dsw
Index: libtcnative.dsw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsw,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtcnative.dsw 17 Jan 2005 07:17:06 -0000 1.2
+++ libtcnative.dsw 17 Jan 2005 18:27:47 -0000 1.3
@@ -3,6 +3,18 @@
###############################################################################
+Project: "apr"=..\apr\apr.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "libapr"=..\apr\libapr.dsp - Package Owner=<4>
Package=<5>
@@ -25,6 +37,21 @@
{{{
Begin Project Dependency
Project_Dep_Name libapr
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "tcnative"=.\tcnative.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name apr
End Project Dependency
}}}
1.3 +4 -4 jakarta-tomcat-connectors/jni/native/tcnative.dsp
Index: tcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/tcnative.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcnative.dsp 17 Jan 2005 07:17:06 -0000 1.2
+++ tcnative.dsp 17 Jan 2005 18:27:47 -0000 1.3
@@ -43,7 +43,7 @@
# 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 /I "./include" /I "../apr/include" /I
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\tcnative_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
"../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
"$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D
"_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Release\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 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
wldap32.lib ole32.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
ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug
/machine:I386 /out:"Release/tcnative-1.dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug
/machine:I386 /out:"Release/tcnative-1.dll" /opt:ref
!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
@@ -69,7 +69,7 @@
# 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
"$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D
"TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\tcnative_src" /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" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D
"_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Debug\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 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
wldap32.lib ole32.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
ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no
/debug /machine:I386 /out:"Debug/tcnative-1.dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /out:"Debug/tcnative-1.dll"
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
