VirtualBox

Ignore:
Timestamp:
May 6, 2019 9:31:01 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
130405
Message:

Additions,GuestHost/OpenGL,HostServices/SharedOpenGL: Get rid of the individual SPU shared libraries and merge them into the VBoxSharedCrOpenGL shared libraries on the host and VBoxOGL{,-x86} shared libraries for the guest additions, bugref:9435

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r78340 r78408  
    2727if1of ($(KBUILD_TARGET), win linux solaris freebsd)
    2828 DLLS += \
    29     VBoxOGL \
     29    VBoxOGL
     30
     31 LIBRARIES += \
    3032    VBoxOGLpassthroughspu \
    3133    VBoxOGLpackspu \
    … …  
    3436
    3537VBOX_OGL_X86_GUEST_DLLS = \
    36      VBoxOGL-x86 \
     38     VBoxOGL-x86
     39
     40VBOX_OGL_X86_GUEST_LIBRARIES = \
    3741     VBoxOGLpassthroughspu-x86 \
    3842     VBoxOGLpackspu-x86 \
    … …  
    4145ifdef VBOX_WITH_WDDM
    4246 DLLS.win.amd64 += $(VBOX_OGL_X86_GUEST_DLLS)
     47 LIBRARIES.win.amd64 += $(VBOX_OGL_X86_GUEST_LIBRARIES)
    4348endif
    4449
    … …  
    202207 endif
    203208endif
    204 # VBoxOGL_LIBS = \  # VBOX_LIB_OGL_CRUTIL includes these and caused an interesting conflict.
    205 #       $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
    206 #       $(VBOX_LIB_VBGL_R3_SHARED) \
    207 
    208209VBoxOGL_LIBS = \
     210        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
     211        $(VBOX_LIB_VBGL_R3_SHARED) \
    209212        $(VBOX_LIB_OGL_CRUTIL) \
    210         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
     213        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
     214        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
     215        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) \
     216        $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu$(VBOX_SUFF_LIB) \
     217        $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu$(VBOX_SUFF_LIB) \
     218        $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu$(VBOX_SUFF_LIB) \
     219        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu$(VBOX_SUFF_LIB)
    211220
    212221VBoxOGL_LIBS.win += \
    … …  
    256265        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
    257266        $(VBOX_LIB_OGL_CRUTIL_X86) \
    258         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
     267        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
     268        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
     269        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) \
     270        $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu-x86$(VBOX_SUFF_LIB) \
     271        $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu-x86$(VBOX_SUFF_LIB) \
     272        $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu-x86$(VBOX_SUFF_LIB) \
     273        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu-x86$(VBOX_SUFF_LIB)
    259274
    260275VBoxOGL-x86_LIBS.win += \
    … …  
    448463# VBoxOGLpassthroughspu
    449464#
    450 VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
     465VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTLIB
    451466VBoxOGLpassthroughspu_INCS        = \
    452467        passthrough \
    … …  
    456471        $(VBOX_GL_INCS)
    457472endif
    458 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    459  VBoxOGLpassthroughspu_INSTTYPE.win = none
    460  VBoxOGLpassthroughspu_DEBUG_INSTTYPE.win = both
    461 endif
    462473VBoxOGLpassthroughspu_SOURCES     = \
    463474        passthrough/passthroughspu_init.c \
    464475        $(VBOX_PATH_CROGL_GENFILES)/passthroughspu.c
    465 VBoxOGLpassthroughspu_SOURCES.win = \
    466         passthrough/passthrough.def \
    467         passthrough/passthroughspu.rc
    468476VBoxOGLpassthroughspu_CLEAN       = \
    469477        $(VBOX_PATH_CROGL_GENFILES)/passthroughspu.c
    470 VBoxOGLpassthroughspu_LIBS        = \
    471         $(VBOX_LIB_OGL_CRUTIL)
    472478ifdef VBOX_WITH_CRHGSMI
    473479VBoxOGLpassthroughspu_DEFS.win   += VBOX_WITH_CRHGSMI
    … …  
    497503# VBoxOGLpackspu
    498504#
    499 VBoxOGLpackspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
     505VBoxOGLpackspu_TEMPLATE      = VBOXCROGLR3GUESTLIB
    500506VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
    501507VBoxOGLpackspu_INCS          = \
    … …  
    505511 VBoxOGLpackspu_INCS += \
    506512        $(VBOX_GL_INCS)
    507 endif
    508 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    509  VBoxOGLpackspu_INSTTYPE.win = none
    510  VBoxOGLpackspu_DEBUG_INSTTYPE.win = both
    511513endif
    512514VBoxOGLpackspu_INTERMEDIATES = \
    … …  
    532534        $(VBOX_PATH_CROGL_GENFILES)/packspu_flush.c \
    533535        $(VBOX_PATH_CROGL_GENFILES)/packspu_beginend.c
    534 VBoxOGLpackspu_SOURCES.win = \
    535         pack/pack.def \
    536         pack/packspu.rc
    537536VBoxOGLpackspu_CLEAN       = \
    538537        $(VBOX_PATH_CROGL_GENFILES)/packspu_proto.h \
    … …  
    541540        $(VBOX_PATH_CROGL_GENFILES)/packspu_flush.c \
    542541        $(VBOX_PATH_CROGL_GENFILES)/packspu_beginend.c
    543 VBoxOGLpackspu_LIBS        = \
    544         $(VBOX_LIB_OGL_CRUTIL) \
    545         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    546         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
    547         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
    548542VBoxOGLpackspu_LIBS.win += \
    549543        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
    … …  
    570564VBoxOGLpackspu-x86_EXTENDS = VBoxOGLpackspu
    571565VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
    572 VBoxOGLpackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    573         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    574         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
    575         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
    576566VBoxOGLpackspu-x86_LIBS.win += \
    577567        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
    … …  
    607597# VBoxOGLfeedbackspu
    608598#
    609 VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
     599VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTLIB
    610600VBoxOGLfeedbackspu_INCS        = \
    611601        feedback \
    … …  
    614604 VBoxOGLfeedbackspu_INCS += \
    615605        $(VBOX_GL_INCS)
    616 endif
    617 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    618  VBoxOGLfeedbackspu_INSTTYPE.win = none
    619  VBoxOGLfeedbackspu_DEBUG_INSTTYPE.win = both
    620606endif
    621607VBoxOGLfeedbackspu_INTERMEDIATES = \
    … …  
    627613        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu.c \
    628614        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_state.c
    629 VBoxOGLfeedbackspu_SOURCES.win = \
    630         feedback/feedback.def \
    631         feedback/feedbackspu.rc
    632615VBoxOGLfeedbackspu_CLEAN       = \
    633616        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_proto.h \
    … …  
    635618        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_state.c
    636619VBoxOGLfeedbackspu_LIBS        = \
    637         $(VBOX_LIB_OGL_CRUTIL) \
    638         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    639620        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
    640621ifdef VBOX_WITH_CRHGSMI
    … …  
    651632VBoxOGLfeedbackspu-x86_EXTENDS = VBoxOGLfeedbackspu
    652633VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
    653 VBoxOGLfeedbackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    654         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    655         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    656634VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
    657635endif
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette