summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Module_ooo.mk5
-rwxr-xr-xRepositoryFixes.mk78
-rw-r--r--solenv/gbuild/platform/winmingw.mk5
-rw-r--r--solenv/inc/libs.mk2
4 files changed, 44 insertions, 46 deletions
diff --git a/Module_ooo.mk b/Module_ooo.mk
index b8f9a40848be..fa5921789b52 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -38,6 +38,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
idl \
linguistic \
padmin \
+ regexp \
+ sax \
sfx2 \
sot \
starmath \
@@ -52,7 +54,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unoxml \
vcl \
xmloff \
-+ xmlscript \
+ xmlreader \
+ xmlscript \
vbahelper \
))
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b501e8509ce8..7286f2724135 100755
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -29,6 +29,7 @@
# not follow any of the established nameschemes
ifeq ($(OS),LINUX)
+
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
@@ -43,10 +44,21 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-endif
+endif # ifeq ($(OS),LINUX)
+ifeq ($(OS),SOLARIS)
+
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
+
+endif
ifeq ($(OS),MACOSX)
+
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
@@ -58,11 +70,12 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENA
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-endif
-
+endif # ifeq ($(OS),MACOSX)
ifeq ($(OS),WNT)
+
ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -78,19 +91,26 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
icuuc \
- sot \
uwinapi \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
gb_Library_ILIBFILENAMES:=\
unicows \
uuid \
@@ -110,7 +130,8 @@ gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(g
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-else
+else #ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -125,46 +146,25 @@ gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
-gb_Library_NOILIBFILENAMES:=\
- advapi32 \
- cairo \
- d3d9 \
- d3dx \
- ddraw \
- expat \
- expat_xmltok\
- expat_xmlparse \
- gdi32 \
- gdiplus \
+
+# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
+gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
+gb_Library_NOILIBFILENAMES += icuuc
graphite_dll \
- gnu_getopt \
- icuuc \
icule \
imm32\
- kernel32 \
msimg32 \
- msvcrt \
- mpr \
- oldnames \
- ole32 \
- oleaut32 \
- shell32 \
- sot \
- unicows \
- user32 \
- uuid \
- uwinapi \
- winmm \
winspool \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
+
ifneq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
endif
@@ -174,19 +174,9 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
-
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
+endif # ifeq ($(OS),WNT)
# we do not require a known rule for these, when using system libs
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index ccf9359d9ccd..dfe7ade27cae 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -469,7 +469,12 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
+ gdiplus \
kernel32 \
msvcrt \
mpr \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index c0781a9f5076..6533a619591f 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -400,7 +400,7 @@ OTXLIB=otx_ind.lib
OSXLIB=osx.lib
REGLIB=ireg.lib
EXTLIB=iext.lib
-SOTLIB=sot.lib
+SOTLIB=isot.lib
MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
MOZBASELIB=nspr4.lib xpcom.lib
LDAPSDKLIB=nsldap32v50.lib
generated by cgit (git 2.34.1) at 2024-08-17 20:52:21 +0000