Changeset 53600 in vbox

Timestamp:

Dec 22, 2014 12:11:04 PM (10 years ago)

Author:

vboxsync

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

97363

Message:

Build fix and preps for replacing DevVGA-SVGA3d-cocoa.m.

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -1389 +1389 @@
  TEMPLATE_VBoxSVGA3D_CFLAGS.darwin  = \
         $(filter-out -fno-common,$(TEMPLATE_VBOXR3_CFLAGS.darwin))
+ TEMPLATE_VBoxSVGA3D_OBJCFLAGS = \
+        $(filter-out -pedantic,$(TEMPLATE_VBOXR3_OBJCFLAGS))
  TEMPLATE_VBoxSVGA3D_LDFLAGS.darwin = $(TEMPLATE_VBOXR3_LDFLAGS.darwin) \
-        -framework AppKit -framework OpenGL
+        -framework AppKit -framework OpenGL -framework IOKit
 
  #
@@ -1416 +1418 @@
         VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT \
         IN_vmsvgashader_STATIC \
+        IN_VMSVGA3D \
         VBOX_WINE_WITH_IPRT
  if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
@@ -1424 +1427 @@
  VBoxSVGA3D_DEFS.win    += \
         USE_WIN32_OPENGL \
-        VBOX_WINE_WITHOUT_LIBWINE
+        VBOX_WINE_WITHOUT_LIBWINE \
+
  # WINE relies on a gcc 4.4 feature but we have 4.2 on Darwin
  VBoxSVGA3D_DEFS.darwin += \
@@ -1438 +1442 @@
         Graphics/shaderlib/wine/include
  VBoxSVGA3D_INCS.darwin := \
+        Graphics/ \
         Graphics/shaderlib/wine/include
  VBoxSVGA3D_SOURCES     := \
@@ -1449 +1454 @@
         Graphics/shaderlib/directx.c \
         Graphics/shaderlib/libWineStub/debug.c
- VBoxSVGA3D_SOURCES.darwin  += \
+ if 1
+ VBoxSVGA3D_SOURCES.darwin += \
         Graphics/DevVGA-SVGA3d-cocoa.m
+ else
+ VBoxSVGA3D_SOURCES.darwin += \
+        ../HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m \
+        ../GuestHost/OpenGL/util/vreg.cpp \
+        ../GuestHost/OpenGL/util/blitter.cpp \
+        ../GuestHost/OpenGL/util/compositor.cpp \
+        ../HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp
+ endif
  VBoxSVGA3D_LIBS        = \
         $(LIB_RUNTIME)