Changeset 53741 in vbox for trunk/src/VBox/Devices/Makefile.kmk

Timestamp:

Jan 5, 2015 11:08:23 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97523

Message:

VMSVGA3d: Reworked the 3.2 core GL profile specific code, putting it inside VBOX_VMSVGA3D_USE_OPENGL_CORE checks instead of RT_OS_DARWIN and always try get a value before falling in back on alternatives.

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -271 +271 @@
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    VBoxDD_LDFLAGS.darwin += -framework OpenGL
+   VBoxDD_DEFS.darwin   += VBOX_VMSVGA3D_USE_OPENGL_CORE  # Use the OpenGL 3.2 Core profile (see also VBoxSVGA3D_DEFS.darwin).
   endif
   Graphics/DevVGA-SVGA3d-ogl.cpp_CXXFLAGS.darwin = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
@@ -1424 +1425 @@
  VBoxSVGA3D_DEFS.win    += \
         USE_WIN32_OPENGL \
-        VBOX_WINE_WITHOUT_LIBWINE \
+        VBOX_WINE_WITHOUT_LIBWINE
+ VBoxSVGA3D_DEFS.darwin += VBOX_VMSVGA3D_USE_OPENGL_CORE  # Use the OpenGL 3.2 Core profile (VBoxSVGA3D_DEFS.darwin).
 
  # WINE relies on a gcc 4.4 feature but we have 4.2 on Darwin