Changes in settings.mk

31bbceb0f9d64c0c2c3b22a794a1666c1f33396e - pre-commit auto remove trailing whitespace from `.mk` files (#377)

Thu, 03 Jul 2025 22:20:41 +0000

pre-commit auto remove trailing whitespace from `.mk` files (#377)If there are too many changes / files I can create a smaller PRThanks List of files: /trunk/main/odk/settings/settings.mk

26c81592e2a56d5b50bbc60282d6c2b633d2d1cb - some macOS changes:

Tue, 09 Feb 2021 19:36:31 +0000

some macOS changes: o ensure current assembly of privateSnippetExecutor o BigSur note o Use vars to make it easier to change overall options o Java8 compatibility(cherry picked from commit 3187fb04a7844dcbfa332c4129f6e43deb893699) List of files: /trunk/main/odk/settings/settings.mk

87d312e104f42aa66947f904316bcfa8acaac201 - No longer support 10.7/10.8

Tue, 02 Feb 2021 21:12:41 +0000

No longer support 10.7/10.8(cherry picked from commit 530c83014bcf6ffc1a7778591c69217b12b0575d) List of files: /trunk/main/odk/settings/settings.mk

b682cb1878f75d5a69d02f8b5a3182ad77159d98 - macOS reset back to s5abi and older version removed

Sun, 20 Dec 2020 13:37:57 +0000

macOS reset back to s5abi and older version removed List of files: /trunk/main/odk/settings/settings.mk

ac209c856e64014dabdc2eac3f0b899d0ef84d6d - Use standard naming of UNO bridge... it really is gcc3

Wed, 02 Dec 2020 20:21:27 +0000

Use standard naming of UNO bridge... it really is gcc3 List of files: /trunk/main/odk/settings/settings.mk

d92161c409486c8d4a1dd7b24f671df8613b572f - Get macOS building and packaging again. Following changes/fixes:

Fri, 11 Jan 2019 21:44:17 +0000

Get macOS building and packaging again. Following changes/fixes: o Stop pretending/forcing *Nix shared lib versioning on macOS o Use smaller and more easily manageable temp temps by leveraging --headerpad dyld option o misc gbuild fixesgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1851102 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

1cfb2a70b7e97173eb61dbb18b503daf2b6e024d - Update targets for macOS

Thu, 12 Jul 2018 18:50:38 +0000

Update targets for macOSgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1835762 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

9b32443e9ede4c046280df25572bed4e0d53f0a1 - Work on getting macOS building again w/ 4.2.0 and the versioning of libs...

Thu, 12 Jul 2018 17:25:33 +0000

Work on getting macOS building again w/ 4.2.0 and the versioning of libs...what a cluster*git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1835757 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

edd74ba5165751c51050786f638af262ec502968 - Implement initial unfinished support for building 64 bit AOO on 64 bit Windows.

Mon, 12 Mar 2018 17:32:09 +0000

Implement initial unfinished support for building 64 bit AOO on 64 bit Windows.For now, require --enable-win64 to be passed to ./configure and without it build 32 bitbinaries like before.Detect the MSVC compiler only through oowintool (ie. registry keys) and the command line option,not by searching the path, as we need to know the exact path to determine whether the compileroutputs 32 or 64 bit binaries.Pass --aoo32-on-win64 to oowintool when doing the AOO32 on Win64 build, so oowintoolknown to look at the 32 bit registry for Java, as we need a JDK of matching bitness.We may need this option for other oowintool tasks.Introduce the "mscx" COMNAME for 64 bit AOO.Add the remaining gbuild and dmake changes necessary to use the 64 bit MSVC compiler.Patch by: megit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826580 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

db48b0641b487630626ba1a1edb0b5a75a0f8e2c - Revert 1825956 and put it into the win64.patch file instead,

Tue, 06 Mar 2018 16:59:52 +0000

Revert 1825956 and put it into the win64.patch file instead,as it may break building 32 bit AOO on 64 bit Windows.Patch by: megit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1826001 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

b80a7b46ea438c0438abfe61bc02ca9960f3d4da - Win64 has the "mscx" CPPU_ENV.

Tue, 06 Mar 2018 06:14:02 +0000

Win64 has the "mscx" CPPU_ENV.Patch by: megit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1825956 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

78ecfec34f3bb6578b4663d63ae245594c795fe3 - Nothing uses GXX_INCLUDE_PATH, so remove it. The uretest/README

Fri, 05 Jan 2018 20:47:25 +0000

Nothing uses GXX_INCLUDE_PATH, so remove it. The uretest/READMEfile mentions is being needed by the STLport included in the URE,but that does not appear to be true any longer, and it is notused by boost.git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1820351 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

e15a45347c4af89b363e7d092ae18e347f2f052f - Update endianness detection on FreeBSD.

Thu, 08 Dec 2016 01:56:31 +0000

Update endianness detection on FreeBSD.This produces a working AOO on FreeBSD PowerPC64!This is related to i126615 which was also fixed by Curtis a while ago.Kudos for both contributions, makes me want to get a PowerPC to runFreeBSD + AOO on it!Author: Curtis Hamilton -- cmhamilto at gmailgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1773166 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

0bfedac2c8103281735af2d7e76227e4ddb1f055 - Resync/update with trunk as preparation to integration

Wed, 19 Mar 2014 10:14:42 +0000

Resync/update with trunk as preparation to integrationgit-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/alg_writerframes@1579184 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

789d489d73f31a604abc2a1abefbc7a52a1c18b1 - #123509# adapt settings etc. to work with 64 bit office and environment

Thu, 23 Jan 2014 17:13:05 +0000

#123509# adapt settings etc. to work with 64 bit office and environmentmerge from revision 1536312 in the branch rejuvenate01Patch by: Juergen Schmidt git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1560760 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

d3e0dd8eb215533c15e891ee35bd141abe9397ee - Merged with the trunk.

Mon, 02 Sep 2013 10:21:45 +0000

Merged with the trunk.git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/ia2@1519381 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

e5a7b9b26ad29960e7615acecddfd46dbc9b49bc - #i122767# disallow pre-standard C++ for-scope

Wed, 17 Jul 2013 11:55:51 +0000

#i122767# disallow pre-standard C++ for-scopegit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1504081 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

ed9d7cbe1e0d94f453482715c7982b32113cfb44 - #122482# make boost optional and adapt settings

Tue, 11 Jun 2013 15:07:33 +0000

#122482# make boost optional and adapt settingsgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1491828 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

75b2d2d7183dc7bb28b735067331cc5cf7f5a9ab - #122482# remove STLPORT macro from seetings.mk, add msvcprt.lib

Fri, 07 Jun 2013 12:55:00 +0000

#122482# remove STLPORT macro from seetings.mk, add msvcprt.libgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1490620 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk

b3ba5bc7bc48c042d6fa7cb8f3af53ae891b95b5 - #122356# adapt SDK config etc. to 3layer changes

Fri, 31 May 2013 07:23:17 +0000

#122356# adapt SDK config etc. to 3layer changesgit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1488117 13f79535-47bb-0310-9956-ffa450edef68 List of files: /trunk/main/odk/settings/settings.mk