1.1 --- a/epoc32/include/tools/stlport/stl/config/_auto_link.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/tools/stlport/stl/config/_auto_link.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,57 +1,57 @@
1.4 -/* We do not use auto link feature when:
1.5 - * - user asked not to use it (_STLP_DONT_USE_AUTO_LINK)
1.6 - * - STLport is used only as a STL library (_STLP_NO_IOSTREAMS || _STLP_USE_NO_IOSTREAMS)
1.7 - * - we are building a C translation unit, STLport is a C++ Standard library implementation
1.8 - */
1.9 -#if !defined (__BUILDING_STLPORT) && !defined (_STLP_DONT_USE_AUTO_LINK) && \
1.10 - !defined (_STLP_NO_IOSTREAMS) && !defined (_STLP_USE_NO_IOSTREAMS) && \
1.11 - defined (__cplusplus)
1.12 -
1.13 -# define _STLP_STRINGIZE(X) _STLP_STRINGIZE_AUX(X)
1.14 -# define _STLP_STRINGIZE_AUX(X) #X
1.15 -
1.16 -# if defined (_STLP_DEBUG)
1.17 -# define _STLP_LIB_OPTIM_MODE "stld"
1.18 -# elif defined (_DEBUG)
1.19 -# define _STLP_LIB_OPTIM_MODE "d"
1.20 -# else
1.21 -# define _STLP_LIB_OPTIM_MODE ""
1.22 -# endif
1.23 -
1.24 -# if defined (_STLP_LIB_NAME_MOTIF)
1.25 -# define _STLP_LIB_MOTIF "_"_STLP_LIB_NAME_MOTIF
1.26 -# else
1.27 -# define _STLP_LIB_MOTIF ""
1.28 -# endif
1.29 -
1.30 -# if defined (_STLP_USE_DYNAMIC_LIB)
1.31 -# if defined (_STLP_USING_CROSS_NATIVE_RUNTIME_LIB)
1.32 -# define _STLP_LIB_TYPE "_x"
1.33 -# else
1.34 -# define _STLP_LIB_TYPE ""
1.35 -# endif
1.36 -# else
1.37 -# if defined (_STLP_USING_CROSS_NATIVE_RUNTIME_LIB)
1.38 -# define _STLP_LIB_TYPE "_statix"
1.39 -# else
1.40 -# define _STLP_LIB_TYPE "_static"
1.41 -# endif
1.42 -# endif
1.43 -
1.44 -# define _STLP_VERSION_STR _STLP_STRINGIZE(_STLPORT_MAJOR)"."_STLP_STRINGIZE(_STLPORT_MINOR)
1.45 -
1.46 -# define _STLP_STLPORT_LIB "stlport"_STLP_LIB_OPTIM_MODE""_STLP_LIB_TYPE""_STLP_LIB_MOTIF"."_STLP_VERSION_STR".lib"
1.47 -
1.48 -# if defined (_STLP_VERBOSE_AUTO_LINK)
1.49 -# pragma message ("STLport: Auto linking to "_STLP_STLPORT_LIB)
1.50 -# endif
1.51 -# pragma comment (lib, _STLP_STLPORT_LIB)
1.52 -
1.53 -# undef _STLP_STLPORT_LIB
1.54 -# undef _STLP_LIB_OPTIM_MODE
1.55 -# undef _STLP_LIB_TYPE
1.56 -# undef _STLP_STRINGIZE_AUX
1.57 -# undef _STLP_STRINGIZE
1.58 -
1.59 -#endif /* _STLP_DONT_USE_AUTO_LINK */
1.60 -
1.61 +/* We do not use auto link feature when:
1.62 + * - user asked not to use it (_STLP_DONT_USE_AUTO_LINK)
1.63 + * - STLport is used only as a STL library (_STLP_NO_IOSTREAMS || _STLP_USE_NO_IOSTREAMS)
1.64 + * - we are building a C translation unit, STLport is a C++ Standard library implementation
1.65 + */
1.66 +#if !defined (__BUILDING_STLPORT) && !defined (_STLP_DONT_USE_AUTO_LINK) && \
1.67 + !defined (_STLP_NO_IOSTREAMS) && !defined (_STLP_USE_NO_IOSTREAMS) && \
1.68 + defined (__cplusplus)
1.69 +
1.70 +# define _STLP_STRINGIZE(X) _STLP_STRINGIZE_AUX(X)
1.71 +# define _STLP_STRINGIZE_AUX(X) #X
1.72 +
1.73 +# if defined (_STLP_DEBUG)
1.74 +# define _STLP_LIB_OPTIM_MODE "stld"
1.75 +# elif defined (_DEBUG)
1.76 +# define _STLP_LIB_OPTIM_MODE "d"
1.77 +# else
1.78 +# define _STLP_LIB_OPTIM_MODE ""
1.79 +# endif
1.80 +
1.81 +# if defined (_STLP_LIB_NAME_MOTIF)
1.82 +# define _STLP_LIB_MOTIF "_"_STLP_LIB_NAME_MOTIF
1.83 +# else
1.84 +# define _STLP_LIB_MOTIF ""
1.85 +# endif
1.86 +
1.87 +# if defined (_STLP_USE_DYNAMIC_LIB)
1.88 +# if defined (_STLP_USING_CROSS_NATIVE_RUNTIME_LIB)
1.89 +# define _STLP_LIB_TYPE "_x"
1.90 +# else
1.91 +# define _STLP_LIB_TYPE ""
1.92 +# endif
1.93 +# else
1.94 +# if defined (_STLP_USING_CROSS_NATIVE_RUNTIME_LIB)
1.95 +# define _STLP_LIB_TYPE "_statix"
1.96 +# else
1.97 +# define _STLP_LIB_TYPE "_static"
1.98 +# endif
1.99 +# endif
1.100 +
1.101 +# define _STLP_VERSION_STR _STLP_STRINGIZE(_STLPORT_MAJOR)"."_STLP_STRINGIZE(_STLPORT_MINOR)
1.102 +
1.103 +# define _STLP_STLPORT_LIB "stlport"_STLP_LIB_OPTIM_MODE""_STLP_LIB_TYPE""_STLP_LIB_MOTIF"."_STLP_VERSION_STR".lib"
1.104 +
1.105 +# if defined (_STLP_VERBOSE_AUTO_LINK)
1.106 +# pragma message ("STLport: Auto linking to "_STLP_STLPORT_LIB)
1.107 +# endif
1.108 +# pragma comment (lib, _STLP_STLPORT_LIB)
1.109 +
1.110 +# undef _STLP_STLPORT_LIB
1.111 +# undef _STLP_LIB_OPTIM_MODE
1.112 +# undef _STLP_LIB_TYPE
1.113 +# undef _STLP_STRINGIZE_AUX
1.114 +# undef _STLP_STRINGIZE
1.115 +
1.116 +#endif /* _STLP_DONT_USE_AUTO_LINK */
1.117 +