diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-05 10:22:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 10:22:34 +0200 |
| commit | 7d72360c4d67cfc935fb1664b0168c0373c3ad13 (patch) | |
| tree | 66667714d4f61d48b3b186f838843f447aace0ba | |
| parent | d479762475e18c51483241127ca788e661c947c1 (diff) | |
| parent | 5837bc6cf7b1e2b1b71ce318e2748fa37c3d516a (diff) | |
| download | ATCD-7d72360c4d67cfc935fb1664b0168c0373c3ad13.tar.gz | |
Merge pull request #636 from jwillemsen/jwi-fixissue570
Added starter files for MacOSX Mojave
| -rw-r--r-- | ACE/ace/config-macosx-mojave.h | 6 | ||||
| -rw-r--r-- | ACE/ace/config-macosx.h | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx.GNU | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_mojave.GNU | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ACE/ace/config-macosx-mojave.h b/ACE/ace/config-macosx-mojave.h new file mode 100644 index 00000000000..6b0164b9e33 --- /dev/null +++ b/ACE/ace/config-macosx-mojave.h @@ -0,0 +1,6 @@ +#ifndef ACE_CONFIG_MACOSX_MOJAVE_H +#define ACE_CONFIG_MACOSX_MOJAVE_H + +#include "ace/config-macosx-highsierra.h" + +#endif // ACE_CONFIG_MACOSX_MOJAVE_H diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 3c63301d8a5..13a853a9318 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -2,7 +2,9 @@ #define ACE_CONFIG_MACOSX_ALL_H #include <Availability.h> -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 +#include "config-macosx-mojave.h" +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 #include "config-macosx-highsierra.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 #include "config-macosx-sierra.h" diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 4636074a7bc..f318adace60 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -19,12 +19,13 @@ MACOS_CODENAME_VER_10_10 := yosemite MACOS_CODENAME_VER_10_11 := elcapitan MACOS_CODENAME_VER_10_12 := sierra MACOS_CODENAME_VER_10_13 := highsierra -MACOS_CODENAME_VER_latest := highsierra +MACOS_CODENAME_VER_10_14 := mojave +MACOS_CODENAME_VER_latest := mojave MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION)) ifeq ($(MACOS_MAJOR_VERSION),10) - ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 13; echo $$?),0) + ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 14; echo $$?),0) ## if the detected version is greater than the latest know version, ## just use the latest known version MACOS_CODENAME = $(MACOS_CODENAME_VER_latest) diff --git a/ACE/include/makeinclude/platform_macosx_mojave.GNU b/ACE/include/makeinclude/platform_macosx_mojave.GNU new file mode 100644 index 00000000000..908d2971bfd --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_mojave.GNU @@ -0,0 +1,2 @@ +include $(ACE_ROOT)/include/makeinclude/platform_macosx_highsierra.GNU + |