← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/HostServices/SharedOpenGL/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - 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
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostServices/SharedOpenGL/Makefile.kmk
51
51
VBoxSharedCrOpenGL_TEMPLATE = VBOXCROGLR3HOSTDLL
52
52
ifdef VBOX_WITH_XPCOM
53
53
 VBoxSharedCrOpenGL_DEFS = VBOX_WITH_XPCOM
 
54
 VBoxSharedCrOpenGL_CXXFLAGS = -Wno-non-virtual-dtor
54
55
endif
55
56
VBoxSharedCrOpenGL_INTERMEDIATES = \
56
57
        $(TEMPLATE_VBOXMAINEXE_INTERMEDIATES)
126
127
        crserverlib/server_winpos.c \
127
128
        crserverlib/server_writeback.c \
128
129
        crserverlib/server_getshaders.c \
 
130
        crserverlib/server_framebuffer.c \
 
131
        crserverlib/server_glsl.c \
129
132
        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c \
130
133
        $(VBOX_PATH_CROGL_GENFILES)/server_retval.c \
131
134
        $(VBOX_PATH_CROGL_GENFILES)/server_get.c \
140
143
#
141
144
# Generate files for VBoxOGLcrserverlib
142
145
#
143
 
$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch_header.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
 
146
$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch_header.py server_special) $(VBOX_CROGL_API_FILES) $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/state_tracker/state_special | $$(dir $$@)
144
147
        $(call MSG_GENERATE,python,$@,$<)
145
148
        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
146
149
 
147
 
$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
 
150
$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch.py server_special) $(VBOX_CROGL_API_FILES) $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/state_tracker/state_special | $$(dir $$@)
148
151
        $(call MSG_GENERATE,python,$@,$<)
149
152
        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
150
153
 
170
173
VBoxOGLcrunpacker_INTERMEDIATES  = \
171
174
        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h \
172
175
        $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \
173
 
        $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h
 
176
        $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h \
 
177
        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
 
178
        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
174
179
VBoxOGLcrunpacker_SOURCES  = \
175
180
        unpacker/unpack_arrays.c \
176
181
        unpacker/unpack_bounds.c \
196
201
        unpacker/unpack_writeback.c \
197
202
        unpacker/unpack_visibleregion.c \
198
203
        unpacker/unpack_shaders.c \
 
204
        unpacker/unpack_framebuffer.c \
199
205
        $(VBOX_PATH_CROGL_GENFILES)/unpack.c
200
206
VBoxOGLcrunpacker_CLEAN = \
201
207
        $(VBOX_PATH_CROGL_GENFILES)/unpack.c \
228
234
VBoxOGLrenderspu_SOURCES.linux   = render/renderspu_glx.c
229
235
VBoxOGLrenderspu_SOURCES.solaris = render/renderspu_glx.c
230
236
VBoxOGLrenderspu_SOURCES.freebsd = render/renderspu_glx.c
231
 
VBoxOGLrenderspu_SOURCES.darwin  = render/renderspu_agl.c
 
237
ifdef VBOX_WITH_COCOA_QT
 
238
 VBoxOGLrenderspu_SOURCES.darwin = \
 
239
    render/renderspu_cocoa.c \
 
240
    render/renderspu_cocoa_helper.m
 
241
else
 
242
 VBoxOGLrenderspu_SOURCES.darwin = render/renderspu_agl.c
 
243
endif
232
244
VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib
233
245
VBoxOGLrenderspu_LIBS = \
234
246
        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \