← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/crOpenGL/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/crOpenGL/Makefile.kmk
49
49
 ifneq ($(KBUILD_TARGET),solaris)   # No DRI on Solaris yet
50
50
  VBoxOGL_FAKEDRI = 1
51
51
 endif
52
 
# VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
53
 
 VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
54
52
 
55
53
 # Only Solaris right now needs C stubs because I can't figure out how to
56
54
 # generate the GOT based relocation ASM yet.
57
 
 ifeq ($(KBUILD_TARGET),solaris)
58
 
  ifdef VBoxOGL_FAKEDRI
 
55
 ifdef VBoxOGL_FAKEDRI
 
56
  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.x86 solaris.amd64 linux.x86 linux.amd64)
59
57
   VBOX_OGL_GLX_USE_CSTUBS = 1
60
58
  endif
61
59
 endif
77
75
        $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
78
76
        $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
79
77
        $(VBOX_PATH_X11_ROOT)/1.3/xorg \
80
 
        $(VBOX_PATH_MESA_SOURCE) \
81
 
        $(VBOX_PATH_MESA_SOURCE)/include \
82
 
        $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
83
 
        $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
84
 
        $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
85
 
        $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \
 
78
        $(VBOX_MESA_INCS) \
86
79
        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
87
80
 VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
88
81
endif
 
82
 
89
83
ifdef VBoxOGL_DRI
90
84
 VBoxOGL_DEFS          += VBOXOGL_DRI IN_DRI_DRIVER
91
85
else ifdef VBoxOGL_FAKEDRI
92
86
 VBoxOGL_DEFS          += VBOXOGL_FAKEDRI
93
 
 VBoxOGL_DEFS.solaris  += VBOX_OGL_GLX_USE_CSTUBS
 
87
 ifdef VBOX_OGL_GLX_USE_CSTUBS
 
88
  VBoxOGL_DEFS         += VBOX_OGL_GLX_USE_CSTUBS
 
89
 endif
94
90
endif
 
91
 
95
92
ifeq ($(KBUILD_TARGET),win)
96
93
#fixme?, INTERMEDIATES.win ain't working
97
94
 VBoxOGL_INTERMEDIATES += $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h
131
128
 else ifdef VBoxOGL_FAKEDRI
132
129
  VBoxOGL_SOURCES += \
133
130
        fakedri_drv.c
134
 
  VBoxOGL_SOURCES.linux += \
135
 
        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
136
 
        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm
137
131
  ifndef VBOX_OGL_GLX_USE_CSTUBS
138
132
   VBoxOGL_SOURCES.solaris += \
139
133
        $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm \
140
134
        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm
 
135
  VBoxOGL_SOURCES.linux += \
 
136
        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
 
137
        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm
141
138
  else
142
139
   VBoxOGL_SOURCES.solaris += \
143
140
        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c  
 
141
  VBoxOGL_SOURCES.linux += \
 
142
        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c  
144
143
  endif
145
144
 else
146
145
  VBoxOGL_SOURCES.linux += \
294
293
        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
295
294
  endif
296
295
 else
297
 
  # @todo linux if required
298
296
  ifeq ($(KBUILD_TARGET),solaris)
299
297
$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c: \
300
298
                $(PATH_SUB_CURRENT)/SunOS_exports.py \
302
300
                | $$(dir $$@)
303
301
        $(call MSG_GENERATE,python,$@,$<)
304
302
        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
 
303
  else
 
304
$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c: \
 
305
                $(PATH_SUB_CURRENT)/Linux_exports.py \
 
306
                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
 
307
                | $$(dir $$@)
 
308
        $(call MSG_GENERATE,python,$@,$<)
 
309
        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
305
310
  endif
306
311
 endif # VBOX_OGL_GLX_USE_CSTUBS
307
312
endif
313
318
VBoxOGLarrayspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
314
319
VBoxOGLarrayspu_INCS          = \
315
320
        array
 
321
if1of ($(KBUILD_TARGET),linux solaris)
 
322
 VBoxOGLarrayspu_INCS += \
 
323
        $(VBOX_MESA_INCS)
 
324
endif
316
325
VBoxOGLarrayspu_INCS.darwin  += $(PATH_OUT)/obj/VBoxOGL
317
326
VBoxOGLarrayspu_INTERMEDIATES = \
318
327
        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
335
344
VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
336
345
VBoxOGLpassthroughspu_INCS        = \
337
346
        passthrough
 
347
if1of ($(KBUILD_TARGET),linux solaris)
 
348
 VBoxOGLpassthroughspu_INCS += \
 
349
        $(VBOX_MESA_INCS)
 
350
endif
338
351
VBoxOGLpassthroughspu_SOURCES     = \
339
352
        passthrough/passthroughspu_init.c \
340
353
        $(VBOX_PATH_CROGL_GENFILES)/passthroughspu.c
360
373
VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
361
374
VBoxOGLpackspu_INCS          = \
362
375
        pack
 
376
if1of ($(KBUILD_TARGET),linux solaris)
 
377
 VBoxOGLpackspu_INCS += \
 
378
        $(VBOX_MESA_INCS)
 
379
endif
363
380
VBoxOGLpackspu_INTERMEDIATES = \
364
381
        $(VBOX_PATH_CROGL_GENFILES)/packspu_proto.h \
365
382
        $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h
426
443
VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
427
444
VBoxOGLfeedbackspu_INCS        = \
428
445
        feedback
 
446
if1of ($(KBUILD_TARGET),linux solaris)
 
447
 VBoxOGLfeedbackspu_INCS += \
 
448
        $(VBOX_MESA_INCS)
 
449
endif
429
450
VBoxOGLarrayspu_INTERMEDIATES = \
430
451
        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_proto.h
431
452
VBoxOGLfeedbackspu_SOURCES     = \