Differential D25496 Diff 73810 emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
Changeset View
Changeset View
Standalone View
Standalone View
emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
| --- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-07-18 11:50:43 UTC | --- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2020-05-13 19:37:03 UTC | ||||
| +++ src/VBox/Additions/common/crOpenGL/Makefile.kmk | +++ src/VBox/Additions/common/crOpenGL/Makefile.kmk | ||||
| @@ -47,9 +47,7 @@ endif | @@ -50,9 +50,7 @@ endif | ||||
| if1of ($(KBUILD_TARGET), linux solaris freebsd) | if1of ($(KBUILD_TARGET), linux solaris freebsd) | ||||
| #VBoxOGL_DRI = 1 | #VBoxOGL_DRI = 1 | ||||
| DLLS += VBoxEGL | DLLS += VBoxEGL | ||||
| - ifn1of ($(KBUILD_TARGET),linux solaris) # No DRI on Solaris yet | - ifn1of ($(KBUILD_TARGET),linux solaris) # No DRI on Solaris yet | ||||
| - VBoxOGL_FAKEDRI = 1 | - VBoxOGL_FAKEDRI = 1 | ||||
| - endif | - endif | ||||
| + #VBoxOGL_FAKEDRI = 1 | + #VBoxOGL_FAKEDRI = 1 | ||||
| # Only Solaris right now needs C stubs because I can't figure out how to | # Only Solaris right now needs C stubs because I can't figure out how to | ||||
| # generate the GOT based relocation ASM yet. | # generate the GOT based relocation ASM yet. | ||||
| @@ -184,10 +182,12 @@ VBoxOGL_CLEAN.linux += \ | @@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux += \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c | $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c | ||||
| VBoxOGL_CLEAN.solaris += \ | VBoxOGL_CLEAN.solaris += \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c | $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c | ||||
| +VBoxOGL_CLEAN.freebsd += \ | +VBoxOGL_CLEAN.freebsd += \ | ||||
| + $(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c | + $(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c | ||||
| VBoxOGL_CLEAN.win = \ | VBoxOGL_CLEAN.win = \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \ | $(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/cropengl.def | $(VBOX_PATH_CROGL_GENFILES)/cropengl.def | ||||
| -if1of ($(KBUILD_TARGET), linux solaris) | -if1of ($(KBUILD_TARGET), linux solaris) | ||||
| +if1of ($(KBUILD_TARGET), linux solaris freebsd) | +if1of ($(KBUILD_TARGET), linux solaris freebsd) | ||||
| ifdef VBoxOGL_DRI | ifdef VBoxOGL_DRI | ||||
| VBoxOGL_CLEAN += \ | VBoxOGL_CLEAN += \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \ | $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \ | ||||
| @@ -200,6 +200,8 @@ if1of ($(KBUILD_TARGET), linux solaris) | @@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris) | ||||
| $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm | $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm | ||||
| VBoxOGL_CLEAN.solaris += \ | VBoxOGL_CLEAN.solaris += \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm | $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm | ||||
| + VBoxOGL_CLEAN.freebsd += \ | + VBoxOGL_CLEAN.freebsd += \ | ||||
| + $(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm | + $(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm | ||||
| endif | endif | ||||
| endif | endif | ||||
| VBoxOGL_LIBS = \ | VBoxOGL_LIBS = \ | ||||
| @@ -229,6 +231,8 @@ if1of ($(KBUILD_TARGET), linux solaris f | @@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd) | ||||
| else | else | ||||
| VBoxOGL_SONAME.linux = libGL.so.1 | VBoxOGL_SONAME.linux = libGL.so.1 | ||||
| VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain | VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain | ||||
| + VBoxOGL_SONAME.freebsd = libGL.so.1 | + VBoxOGL_SONAME.freebsd = libGL.so.1 | ||||
| + VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain | + VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain | ||||
| endif | endif | ||||
| endif | endif | ||||
| ifdef VBOX_WITH_CRHGSMI | ifdef VBOX_WITH_CRHGSMI | ||||
| @@ -237,7 +241,7 @@ endif | @@ -252,7 +256,7 @@ endif | ||||
| ifdef VBOX_WITH_WDDM | ifdef VBOX_WITH_WDDM | ||||
| VBoxOGL_DEFS.win += VBOX_WITH_WDDM | VBoxOGL_DEFS.win += VBOX_WITH_WDDM | ||||
| endif | endif | ||||
| -if1of ($(KBUILD_TARGET), linux) | -if1of ($(KBUILD_TARGET), linux) | ||||
| +if1of ($(KBUILD_TARGET), linux freebsd) | +if1of ($(KBUILD_TARGET), linux freebsd) | ||||
| VBoxOGL_LDFLAGS += -Wl,-z,nodelete | VBoxOGL_LDFLAGS += -Wl,-z,nodelete | ||||
| endif | endif | ||||
| ifdef VBOX_WITH_WDDM | ifdef VBOX_WITH_WDDM | ||||
| @@ -395,6 +399,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_expo | @@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \ | ||||
| $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@) | $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@) | ||||
| $(call MSG_GENERATE,python,$@,$<) | $(call MSG_GENERATE,python,$@,$<) | ||||
| $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< | $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< | ||||
| + else ifeq ($(KBUILD_TARGET),freebsd) | + else ifeq ($(KBUILD_TARGET),freebsd) | ||||
| +$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \ | +$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \ | ||||
| + $(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \ | + $(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \ | ||||
| + $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \ | + $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \ | ||||
| + | $$(dir $$@) | + | $$(dir $$@) | ||||
| + $(call MSG_GENERATE,python,$@,$<) | + $(call MSG_GENERATE,python,$@,$<) | ||||
| + $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) | + $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) | ||||
| +$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_i386_glxapi_exports.py | $$(dir $$@) | +$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_i386_glxapi_exports.py | $$(dir $$@) | ||||
| + $(call MSG_GENERATE,python,$@,$<) | + $(call MSG_GENERATE,python,$@,$<) | ||||
| + $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< | + $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< | ||||
| else | else | ||||
| $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \ | $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \ | ||||
| @@ -712,6 +726,7 @@ VBoxEGL_SOURCES = egl.c | @@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS | ||||
| VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7 | endif | ||||
| VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED) | VBoxEGL_LIBS = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED) | ||||
| VBoxEGL_SONAME.linux = libEGL.so.1 | VBoxEGL_SONAME.linux = libEGL.so.1 | ||||
| +VBoxEGL_SONAME.freebsd = libEGL.so.1 | +VBoxEGL_SONAME.freebsd = libEGL.so.1 | ||||
| include $(FILE_KBUILD_SUB_FOOTER) | include $(FILE_KBUILD_SUB_FOOTER) | ||||