*** empty log message ***

5 files changed, 40 insertions, 19 deletions

diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index 8d3309dc8415..218fe950ac9f 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: jl $ $Date: 2001-04-23 09:12:56 $
+#   last change: $Author: jl $ $Date: 2001-04-23 14:48:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -106,6 +106,11 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1EXPORTFILE=	exports.dxp
 
 DEF1NAME=	$(SHL1TARGET)
+# generate exports ------------------------------------------------
+#DEF1DEPN=      $(MISC)$/$(SHL1TARGET).flt
+#DEFLIB1NAME=   $(TARGET)
+#-----------------------------------------------------------------
+
 
 .IF "$(OS)$(CPU)"=="SOLARISS"
 SHL1VERSIONMAP=	sols.map
@@ -129,13 +134,22 @@ APP1STDLIBS= \
 
 #LIBCIMT=msvcrtd.lib
 
-APP1LIBS=	$(LB)$/isamplelibrtti.lib
+.IF "$(OS)" == "WNT"
+APP1STDLIBS+=	$(LB)$/isamplelibrtti.lib
+.ELSE
+APP1STDLIBS+=	-lsamplelibrtti
+.ENDIF 
+
 
 .IF "$(GUI)"=="WNT"
 APP1STDLIBS += $(LIBCIMT)
 .ENDIF
 
-APP1DEF=	$(MISC)\$(APP1TARGET).def
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+$(MISC)$/$(SHL1TARGET).flt : makefile.mk
+       +echo   _TI2       >$@
+       +echo   _TI1      >>$@
+
diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx
index 6b485474c163..3ca8c7091a85 100644
--- a/salhelper/test/rtti/rttitest.cxx
+++ b/salhelper/test/rtti/rttitest.cxx
@@ -24,5 +24,6 @@ int main( int argc, char *argv[ ], char *envp[ ] )
 
 
     MyClassB* pB= dynamic_cast<MyClassB* >( pA);
+        pB->funcA();
     return 0;
 }
diff --git a/salhelper/test/rtti/samplelibrtti.cxx b/salhelper/test/rtti/samplelibrtti.cxx
index 2b2bf930a8d9..15e2662d59cd 100644
--- a/salhelper/test/rtti/samplelibrtti.cxx
+++ b/salhelper/test/rtti/samplelibrtti.cxx
@@ -32,4 +32,4 @@ void MyClassB::funcC()
 
 void MyClassB::funcD()
 {
-}
\ No newline at end of file
+}
diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx
index 4ce52234fc7a..5f1294dd73af 100644
--- a/salhelper/test/rtti/samplelibrtti.hxx
+++ b/salhelper/test/rtti/samplelibrtti.hxx
@@ -25,4 +25,4 @@ private:
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index c61280515a2e..ab0937aa201e 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -3,19 +3,25 @@ SALHLP_1_0 {
 GetVersionInfo;
 _fini;
 _init;
-__1cJsalhelperSORealDynamicLoaderLnewInstance6Fpp1rknDrtlIOUString_7_2_;
-__1cJsalhelperSORealDynamicLoader2t5B6Mpp1rknDrtlIOUString_7pv8_v_;
-__1cJsalhelperSORealDynamicLoader2t6Mpp1rknDrtlIOUString_7pv8_v_;
-__1cJsalhelperSORealDynamicLoaderG__vtbl_;
-__1cJsalhelperSORealDynamicLoader2T5B6M_v_;
-__1cJsalhelperSORealDynamicLoader2T6M_v_;
-__1cJsalhelperbR__RTTI__1CpknJsalhelperSORealDynamicLoader__;
-__1cJsalhelperbQ__RTTI__1CpnJsalhelperSORealDynamicLoader__;
-__1cJsalhelperbO__RTTI__1nJsalhelperSORealDynamicLoader__;
-__1cJsalhelperSORealDynamicLoaderHacquire6M_L_;
-__1cJsalhelperSORealDynamicLoaderHrelease6M_L_;
-__1cJsalhelperSORealDynamicLoaderGgetApi6kM_pv_;
-    local:
+
+__1cIMyClassAFfuncA6M_v_;
+__1cIMyClassAFfuncB6M_v_;
+__1cIMyClassAFfuncC6M_v_;
+__1cIMyClassAFfuncD6M_v_;
+__1cIMyClassAG__vtbl_;
+__1cIMyClassBFfuncA6M_v_;
+__1cIMyClassBFfuncB6M_v_;
+__1cIMyClassBFfuncC6M_v_;
+__1cIMyClassBFfuncD6M_v_;
+__1cIMyClassBG__vtbl_;
+__RTTI__1CpknIMyClassA_;
+__RTTI__1CpknIMyClassB_;
+__RTTI__1CpnIMyClassA_;
+__RTTI__1CpnIMyClassB_;
+__RTTI__1nIMyClassA_;
+__RTTI__1nIMyClassB_;
+
+local:
         *;
 };