summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/libs.mk6
-rw-r--r--solenv/inc/rules.mk4
-rw-r--r--solenv/inc/settings.mk47
-rw-r--r--solenv/inc/target.mk62
-rw-r--r--solenv/inc/tg_dep.mk3
-rw-r--r--solenv/inc/unxand.mk2
-rw-r--r--solenv/inc/unxgcc.mk3
-rw-r--r--solenv/inc/unxiosr.mk3
-rw-r--r--solenv/inc/unxsogs.mk4
-rw-r--r--solenv/inc/wntgcci.mk3
10 files changed, 17 insertions, 120 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 0f25a6b6fbfb..f705d5f0b8fb 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -193,11 +193,7 @@ MINIZIP3RDLIB=$(MINIZIP_LIBS)
# internally, minizip is included in zlib
MINIZIP3RDLIB=
.ENDIF
-.IF "$(SYSTEM_JPEG)"=="YES"
JPEG3RDLIB=-ljpeg
-.ELSE
-JPEG3RDLIB=-ljpeglib
-.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-l$(DB_LIB)
.ELIF "$(GUI)$(COM)"=="WNTGCC"
@@ -445,7 +441,7 @@ CLUCENELIB=iclucene.lib
EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
-JPEG3RDLIB=jpeglib.lib
+JPEG3RDLIB=jpeg.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 327955fde0f5..02ed21d17ce6 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -623,10 +623,6 @@ $(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
@$(TOUCH) $@
@echo XML2MK_FILES += $(@:b) >> $@
-#generate descriptions from xml
-$(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
- xml2cmp -func $(MISC)/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $<
-
#generate private rdb
$(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
$(COMMAND_ECHO)$(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 15bd3f0c7eb0..b9db9fd38b56 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1245,53 +1245,6 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc
# --- Compiler -----------------------------------------------------
.INCLUDE : rules.mk
-# --- include typelists --------------------------------------------
-
-.IF "$(COMP1TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP2TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP3TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP4TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP5TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP6TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP7TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP8TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP9TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
# some place to define these jars for SO environment
XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index d5b4ce195806..8f20e72d8e43 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -657,70 +657,8 @@ SHL9BASEX=/BASE:$(SHL9BASE)
.ENDIF
.ENDIF
-.IF "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
-.IF "$(UNOUCRRDB)"!=""
-COMPRDB*:=$(UNOUCRRDB)
-.ELSE # "$(UNOUCRRDB)"!=""
-COMPRDB*:=$(SOLARBINDIR)/types.rdb
-.ENDIF # "$(UNOUCRRDB)"!=""
-.ENDIF # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
-.IF "$(COMP1TYPELIST)"!=""
-UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES)
-COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb
-#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP2TYPELIST)"!=""
-UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES)
-COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb
-#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP3TYPELIST)"!=""
-UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES)
-COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb
-#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP4TYPELIST)"!=""
-UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES)
-COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb
-#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP5TYPELIST)"!=""
-UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES)
-COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb
-#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP6TYPELIST)"!=""
-UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES)
-COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb
-#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP7TYPELIST)"!=""
-UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES)
-COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb
-#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP8TYPELIST)"!=""
-UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES)
-COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb
-#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP9TYPELIST)"!=""
-UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES)
-COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb
-#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml
-.ENDIF
-
UNOTYPES!:=$(strip $(UNOTYPES))
-#moved here to get UNOTYPES from COMPxTYPELIST
.IF "$(UNOTYPES)" != ""
UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp"))
UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index eac13e84f247..3819a71464bd 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -16,14 +16,13 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
+.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!=""
ALLDEP .PHONY:
@-$(IFEXIST) $(SRS)/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)/$(TARGET).*.dpr >& $(NULLDEV) $(FI)
@@-$(RM) $(MISC)/$(TARGET).dpr
@@-$(RM) $(MISC)/$(TARGET).*.dprr
@@-$(RM) $(MISC)/$(TARGET).dpj
@@-$(RM) $(MISC)/$(TARGET).dpz
- @@-$(RM) $(MISC)/$(COMP1TYPELIST).mk $(MISC)/$(COMP2TYPELIST).mk $(MISC)/$(COMP3TYPELIST).mk $(MISC)/$(COMP4TYPELIST).mk $(MISC)/$(COMP5TYPELIST).mk $(MISC)/$(COMP6TYPELIST).mk $(MISC)/$(COMP7TYPELIST).mk $(MISC)/$(COMP8TYPELIST).mk $(MISC)/$(COMP9TYPELIST).mk
.IF "$(nodep)"==""
.IF "$(DEPFILE_SLO)"!=""
@@-$(RM) $(DEPFILE_SLO)
diff --git a/solenv/inc/unxand.mk b/solenv/inc/unxand.mk
index 8025388a9f64..60f389b63bb6 100644
--- a/solenv/inc/unxand.mk
+++ b/solenv/inc/unxand.mk
@@ -76,3 +76,5 @@ LINKFLAGSRUNPATH_URELIB=
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=
LINKFLAGSRUNPATH_SDKBIN=
+
+DLLPOST=.a
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 3ac4956ff216..04419863f32a 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -93,6 +93,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
CFLAGSCXX= -pipe $(ARCH_FLAGS)
+.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE"
+CFLAGSCXX += -fno-threadsafe-statics
+.END
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
CFLAGSCXX+=-fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 089dc3d588aa..f1a64929e20c 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -64,6 +64,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# Normal C++ compilation flags
CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy
+.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE"
+CFLAGSCXX += -fno-threadsafe-statics
+.END
# No PIC needed as we don't build dynamic objects
PICSWITCH:=
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index a4151439beb8..f75c4aa0883e 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -58,6 +58,10 @@ CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
CFLAGSCXX= -pipe $(ARCH_FLAGS)
+.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE"
+CFLAGSCXX += -fno-threadsafe-statics
+.END
+
PICSWITCH:=-fPIC
CFLAGSOBJGUIMT=
CFLAGSOBJCUIMT=
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index c8e39d1570bb..496e8c22c319 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -46,6 +46,9 @@ CFLAGS+=-fmessage-length=0 -c
CFLAGSCC=-pipe $(ARCH_FLAGS)
CFLAGSCXX=-pipe $(ARCH_FLAGS)
+.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE"
+CFLAGSCXX += -fno-threadsafe-statics
+.END
.IF "$(HAVE_CXX0X)" == "TRUE"
# FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x
generated by cgit (git 2.34.1) at 2025-02-05 09:25:12 +0000