Changeset 18034 in vbox for trunk/src/VBox

Timestamp:

Mar 17, 2009 3:17:17 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: workaround linker issues when switching dri/non dri targets

File:

• trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -98 +98 @@
 VBoxOGL_SOURCES.linux  = \
         glx.c \
-        xfont.c \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
+        xfont.c
 ifdef VBoxOGL_DRI
  VBoxOGL_SOURCES.linux += \
         $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c \
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm \
         dri_drv.c
 else ifdef VBoxOGL_FAKEDRI
  VBoxOGL_SOURCES.linux += \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
-        fakedri_drv.c
+        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm \
+        fakedri_drv.c
+else
+ VBoxOGL_SOURCES.linux += \
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
 endif
 VBoxOGL_SOURCES.win    = \
@@ -186 +190 @@
 $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c: $(PATH_SUB_CURRENT)/DD_glc.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
-$(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
+$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
                 $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
@@ -196 +200 @@
 $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h: $(PATH_SUB_CURRENT)/cr_gl.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
-$(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
+$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
                 $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \