Changeset 85013 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 30, 2020 5:57:09 PM (4 years ago)

Author:

vboxsync

Message:

VirtualBox/Makefile.kmk: Just assume VBOX_WITH_NEW_XCODE is define now.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -350 +350 @@
 
 ## @todo we're using a number of deprecated APIs, please fix and remove these!
-ifdef VBOX_WITH_NEW_XCODE
- VirtualBox_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
- VirtualBox_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
- VirtualBox_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
-else
- VirtualBox_CXXFLAGS.darwin    += -Wno-deprecated-declarations
- VirtualBox_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
- VirtualBox_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
-endif
+VirtualBox_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
+VirtualBox_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
+VirtualBox_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
 
 ifeq ($(KBUILD_TYPE),release)
@@ -387 +381 @@
 
 ## @todo we're using a number of deprecated APIs, please fix and remove these!
-ifdef VBOX_WITH_NEW_XCODE
- VirtualBoxVM_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
- VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
- VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
-else
- VirtualBoxVM_CXXFLAGS.darwin    += -Wno-deprecated-declarations
- VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
- VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
-endif
+VirtualBoxVM_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
+VirtualBoxVM_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
+VirtualBoxVM_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
 
 ifeq ($(KBUILD_TYPE),release)
@@ -424 +412 @@
 
 ## @todo we're using a number of deprecated APIs, please fix and remove these!
-ifdef VBOX_WITH_NEW_XCODE
- UICommon_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
- UICommon_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
- UICommon_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
-else
- UICommon_CXXFLAGS.darwin    += -Wno-deprecated-declarations
- UICommon_OBJCFLAGS.darwin   += -Wno-deprecated-declarations
- UICommon_OBJCXXFLAGS.darwin += -Wno-deprecated-declarations
-endif
+UICommon_CXXFLAGS.darwin    += -Wno-error=deprecated-declarations
+UICommon_OBJCFLAGS.darwin   += -Wno-error=deprecated-declarations
+UICommon_OBJCXXFLAGS.darwin += -Wno-error=deprecated-declarations
 
 UICommon_LDFLAGS.darwin = \
@@ -1791 +1773 @@
  PROGRAMS += vmstarter
  vmstarter_TEMPLATE = VBOXR3EXE
- ifdef VBOX_WITH_NEW_XCODE
-  vmstarter_OBJCXXFLAGS += -Wno-error=deprecated-declarations ## @todo fix deprecate API use!
- else
-  vmstarter_OBJCXXFLAGS += -Wno-deprecated-declarations
- endif
+ vmstarter_OBJCXXFLAGS += -Wno-error=deprecated-declarations ## @todo fix deprecate API use!
  vmstarter_LDFLAGS += -framework AppKit
  vmstarter_SOURCES = src/platform/darwin/vmstarter.mm