儲存庫 vbox 的更動 18175

時間撮記:

2009-3-24 下午12:07:10 (16 年 以前)

作者:

vboxsync

訊息:

common/crOpenGL: Solaris bits. FAKEDRI to now builds.

位置:

trunk/src/VBox/Additions/common/crOpenGL

檔案:

• Makefile.kmk (修改) (8 筆差異)
• SunOS_i386_exports.py (新增)
• SunOS_i386_exports_dri.py (新增)
• SunOS_i386_glxapi_exports.py (新增)

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

@@ -49 +49 @@
 if1of ($(KBUILD_TARGET),linux solaris)
  #VBoxOGL_DRI = 1
- ifneq ($(KBUILD_TARGET),solaris)       # temporary
-  VBoxOGL_FAKEDRI = 1
- endif
+ VBoxOGL_FAKEDRI = 1
  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
 endif
@@ -108 +106 @@
         glx.c \
         xfont.c
+
  ifdef VBoxOGL_DRI
   VBoxOGL_SOURCES += \
         $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm \
         dri_drv.c
+  VBoxOGL_SOURCES.linux += \
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm
+  VBoxOGL_SOURCES.solaris += \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm
  else ifdef VBoxOGL_FAKEDRI
   VBoxOGL_SOURCES += \
+        fakedri_drv.c
+  VBoxOGL_SOURCES.linux += \
         $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm \
-        fakedri_drv.c
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm
+  VBoxOGL_SOURCES.solaris += \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm
  else
+  VBoxOGL_SOURCES.linux += \
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
   VBoxOGL_SOURCES.solaris += \
-        $(VBOX_PATH_CROGL_GENFILES)/sunos_exports.c
- VBoxOGL_SOURCES.linux += \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm
  endif
 endif
@@ -136 +142 @@
         $(VBOX_PATH_CROGL_GENFILES)/NULLfuncs.c \
         $(VBOX_PATH_CROGL_GENFILES)/tsfuncs.c
-if1of ($(KBUILD_TARGET),linux solaris)
- VBoxOGL_CLEAN           += \
+VBoxOGL_CLEAN.linux        += \
         $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
-endif
+VBoxOGL_CLEAN.solaris        += \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm
 VBoxOGL_CLEAN.win      = \
         $(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
@@ -151 +157 @@
  else ifdef VBoxOGL_FAKEDRI
   VBoxOGL_CLEAN   += \
-        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
+        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h
+  VBoxOGL_CLEAN.linux   += \
         $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
+  VBoxOGL_CLEAN.solaris   += \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
  endif
 endif
@@ -194 +203 @@
 if !defined(VBoxOGL_DRI) && !defined(VBoxOGL_FAKEDRI)
  ifeq ($(KBUILD_TARGET),solaris)
-$(VBOX_PATH_CROGL_GENFILES)/sunos_exports.c: \
-                $(PATH_SUB_CURRENT)/SunOS_exports.py \
+$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm: \
+                $(PATH_SUB_CURRENT)/SunOS_i386_exports.py \
                 $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
                 | $$(dir $$@)
@@ -213 +222 @@
 $(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)
+ ifeq ($(KBUILD_TARGET),solaris)
+$(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
+                $(PATH_SUB_CURRENT)/SunOS_i386_exports_dri.py \
+                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+                | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) 
+ else
 $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
@@ -218 +234 @@
                 | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+ endif
 else ifdef VBoxOGL_FAKEDRI
 $(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)
+ ifeq ($(KBUILD_TARGET),solaris)
+$(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
+                $(PATH_SUB_CURRENT)/SunOS_i386_exports_dri.py \
+                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+                | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
+ else
 $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
@@ -228 +254 @@
 $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm: $(PATH_SUB_CURRENT)/Linux_i386_glxapi_exports.py | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
+ endif
 endif
 endif