[Stlport-cvs] STLport/stlport/config stl_msvc.h,STLPORT_5_0,1.29.2.48,1.29.2.49

[Francois D. <du...@us...>]

Update of /cvsroot/stlport/STLport/stlport/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31750/stlport/config

Modified Files:
      Tag: STLPORT_5_0
	stl_msvc.h 
Log Message:
no message

Index: stl_msvc.h
===================================================================
RCS file: /cvsroot/stlport/STLport/stlport/config/stl_msvc.h,v
retrieving revision 1.29.2.48
retrieving revision 1.29.2.49
diff -u -d -r1.29.2.48 -r1.29.2.49
--- stl_msvc.h	2 Sep 2005 20:51:00 -0000	1.29.2.48
+++ stl_msvc.h	7 Sep 2005 12:56:46 -0000	1.29.2.49
@@ -309,23 +309,23 @@
 #  define _STLP_STRINGIZE(X) _STLP_STRINGIZE_AUX(X)
 #  define _STLP_STRINGIZE_AUX(X) #X
 
-#  if defined (_STLP_USE_DYNAMIC_LIB)
-#    define _STLP_LIB_TYPE ""
-#  else
-#    define _STLP_LIB_TYPE "static_"
-#  endif
-
 #  if defined (_STLP_DEBUG)
 #    define _STLP_LIB_OPTIM_MODE "stld"
 #  elif defined (_DEBUG)
 #    define _STLP_LIB_OPTIM_MODE "d"
 #  else
-#    define _STLP_LIB_OPTIM_MODE "r"
+#    define _STLP_LIB_OPTIM_MODE ""
 #  endif
 
-#  define _STLP_VERSION_STR _STLP_STRINGIZE(_STLPORT_MAJOR)_STLP_STRINGIZE(_STLPORT_MINOR)
+#  if defined (_STLP_USE_DYNAMIC_LIB)
+#    define _STLP_LIB_TYPE ""
+#  else
+#    define _STLP_LIB_TYPE "_static"
+#  endif
 
-#  define _STLP_STLPORT_LIB "stlport_"_STLP_LIB_TYPE""_STLP_LIB_OPTIM_MODE""_STLP_VERSION_STR".lib"
+#  define _STLP_VERSION_STR _STLP_STRINGIZE(_STLPORT_MAJOR)"."_STLP_STRINGIZE(_STLPORT_MINOR)
+
+#  define _STLP_STLPORT_LIB "stlport"_STLP_LIB_OPTIM_MODE""_STLP_LIB_TYPE"."_STLP_VERSION_STR".lib"
 
 #  if defined (_STLP_VERBOSE_AUTO_LINK)
 #    pragma message ("STLport: Auto linking to "_STLP_STLPORT_LIB)