diff options
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 84 | ||||
| -rwxr-xr-x | sal/util/sal.map | 1 | ||||
| -rw-r--r-- | sal/util/salalloc.list | 7 | ||||
| -rw-r--r-- | sal/util/salalloc.map | 10 | ||||
| -rw-r--r-- | sal/util/saltextenc.map | 6 |
5 files changed, 20 insertions, 88 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 82ebbc811c8d..22f85949dbae 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -66,29 +66,13 @@ LIB1FILES= \ $(SLB)$/cpprtl.lib \ $(SLB)$/textenc.lib -#.IF "$(GUI)"=="UNX" -#LIB1FILES+=$(SLB)$/systoolsunx.lib -#.ENDIF # UNX - - -LIB3TARGET=$(LB)$/a$(TARGET).lib -LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a -LIB3FILES= \ - $(LB)$/oslall.lib \ - $(LB)$/cpposl.lib \ - $(LB)$/cpprtl.lib \ - $(LB)$/textenc.lib - -#.IF "$(GUI)"=="UNX" -#LIB3FILES+=$(LB)$/systoolsunx.lib -#.ENDIF # UNX - -.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2" +.IF "$(COM)" == "MSC" SHL1TARGET= $(TARGET) +SHL1IMPLIB= i$(TARGET) .ELSE SHL1TARGET= uno_$(TARGET) +SHL1IMPLIB= $(SHL1TARGET) .ENDIF -SHL1IMPLIB= i$(TARGET) SHL1VERSIONMAP= $(TARGET).map SHL1RPATH=URELIB @@ -103,7 +87,7 @@ UWINAPILIB= $(LB)$/uwinapi.lib SHL1STDLIBS= \ $(UWINAPILIB)\ $(ADVAPI32LIB)\ - $(WSOCK32LIB)\ + $(WS2_32LIB)\ $(MPRLIB)\ $(SHELL32LIB)\ $(COMDLG32LIB)\ @@ -125,43 +109,10 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract .ENDIF # SOLARIS .ENDIF # UNX -.IF "$(GUI)"=="OS2" -SHL1STDLIBS=pthread.lib -.ENDIF # OS2 - -# If we compile sal with STLport checking iterators -# we need to link against the STLport -.IF "$(USE_STLP_DEBUG)" != "" -SHL1STDLIBS+=$(LIBSTLPORT) -.ENDIF - -#The irony that using the system STL instead of -#stlport requires that we link libsal with the -#LIBSTLPORT alias which is not required when using -#stlport is not lost on me -.IF "$(USE_SYSTEM_STL)"=="YES" -SHL1STDLIBS+=$(LIBSTLPORT) -.ENDIF - .IF "$(OS)"=="MACOSX" SHL1STDLIBS+=-framework CoreFoundation -framework Carbon .ENDIF -.IF "$(OS)" == "LINUX" -.IF "$(PAM_LINK)" == "YES" -SHL1STDLIBS+=-lpam -.ENDIF -.IF "$(CRYPT_LINK)" == "YES" -SHL1STDLIBS+=-lcrypt -.ENDIF -.ENDIF - -# #i105898# required for LD_PRELOAD libsalalloc_malloc.so -# if sal is linked with -Bsymbolic-functions -.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" -SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list -.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" - SHL1LIBS+=$(SLB)$/$(TARGET).lib .IF "$(linkinc)" != "" @@ -182,24 +133,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -# -# This part builds a tiny extra lib, -# containing an alloc.c which uses system -# heap instead of our own mem management. -# This is e.g. useful for proper valgrinding -# the office. -# -.IF "$(OS)"=="LINUX" - -TARGET2 = salalloc_malloc -SHL2TARGET= $(TARGET2) -SHL2IMPLIB= i$(TARGET2) -SHL2VERSIONMAP= salalloc.map - -SHL2LIBS+=$(SLB)$/SYSALLOC_cpprtl.lib - -.ENDIF # .IF "$(OS)"=="LINUX" - # --- Coverage ----------------------------------------------------- # LLA: 20040304 The follows lines are an additional which is only need if we run # coverage tests. For normal test runs this feature is not used. @@ -219,6 +152,15 @@ SHL1STDLIBS+=-lgcc .ENDIF .ENDIF +SHL4DEPN+=$(SHL1TARGETN) +SHL4LIBS=$(SLB)$/textenc_tables.lib +SHL4TARGET=sal_textenc +SHL4STDLIBS=$(SALLIB) +SHL4VERSIONMAP=saltextenc.map + +SHL4DEF=$(MISC)$/$(SHL4TARGET).def +DEF4NAME=$(SHL4TARGET) + # --- Targets ------------------------------------------------------ .ENDIF # $(header) != "" diff --git a/sal/util/sal.map b/sal/util/sal.map index 73ae4431100e..020e11fbcb57 100755 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -553,6 +553,7 @@ UDK_3.5 { UDK_3.6 { # OOo 2.3 global: + osl_loadModuleAscii; osl_getAsciiFunctionSymbol; osl_getModuleHandle; rtl_uString_intern; diff --git a/sal/util/salalloc.list b/sal/util/salalloc.list deleted file mode 100644 index 303d225dda7f..000000000000 --- a/sal/util/salalloc.list +++ /dev/null @@ -1,7 +0,0 @@ -{ - rtl_allocateMemory; - rtl_reallocateMemory; - rtl_freeMemory; - rtl_allocateZeroMemory; - rtl_freeZeroMemory; -}; diff --git a/sal/util/salalloc.map b/sal/util/salalloc.map deleted file mode 100644 index 3cd098b83bdf..000000000000 --- a/sal/util/salalloc.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - rtl_allocateMemory; - rtl_reallocateMemory; - rtl_freeMemory; - rtl_allocateZeroMemory; - rtl_freeZeroMemory; - local: - *; -}; diff --git a/sal/util/saltextenc.map b/sal/util/saltextenc.map new file mode 100644 index 000000000000..e88a0af15723 --- /dev/null +++ b/sal/util/saltextenc.map @@ -0,0 +1,6 @@ +UDK_3_0_0 { + global: + Impl_getTextEncodingData; + local: + *; +}; |