VirtualBox

Ignore:
Timestamp:
Feb 17, 2009 9:15:53 PM (16 years ago)
Author:
vboxsync
Message:

crOpenGL: additions makefiles cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r16685 r16875  
    3131BLDDIRS   += \
    3232        $(VBOX_PATH_CROGL_GENFILES)/
    33 
    34 
    35 #
    36 # Globals
    37 #
    38 if1of ($(KBUILD_HOST), os2 win)
    39  VBOX_CROGL_HOST_PYTHONPATH := $(VBOX_PATH_CROGL_GLAPI);$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer;$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
    40 else
    41  VBOX_CROGL_HOST_PYTHONPATH := $(VBOX_PATH_CROGL_GLAPI):$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer:$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
    42 endif
    43 
    44 
    45 #
    46 # The VBOXOGLR3HOST template.
    47 #
    48 TEMPLATE_VBOXOGLR3HOST                = VBox OpenGL Host Libraries
    49 TEMPLATE_VBOXOGLR3HOST_EXTENDS        = VBOXR3NP
    50 TEMPLATE_VBOXOGLR3HOST_EXTENDS_BY     = prepending
    51 TEMPLATE_VBOXOGLR3HOST_DEFS           = CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
    52 TEMPLATE_VBOXOGLR3HOST_DEFS.win       = _WIN32_WINNT=0x0500 WINDOWS=1
    53 TEMPLATE_VBOXOGLR3HOST_DEFS.linux     = Linux
    54 TEMPLATE_VBOXOGLR3HOST_DEFS.solaris   = SunOS
    55 TEMPLATE_VBOXOGLR3HOST_DEFS.darwin    = DARWIN GL_GLEXT_LEGACY
    56 TEMPLATE_VBOXOGLR3HOST_SDKS.darwin   += DARWIN-OPENGL
    57 TEMPLATE_VBOXOGLR3HOST_INCS           = \
    58         $(VBOX_PATH_CROGL_INCLUDE) \
    59         $(VBOX_PATH_CROGL_GENFILES)
    60 TEMPLATE_VBOXOGLR3HOST_LDFLAGS.linux  = -Wl,--no-as-needed
    61 TEMPLATE_VBOXOGLR3HOST_LDFLAGS.darwin = \
    62         -framework Carbon \
    63         -framework OpenGL \
    64         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
    65 
    6633
    6734ifeq ($(KBUILD_TARGET),darwin)
    … …  
    8249# VBoxSharedCrOpenGL
    8350#
    84 VBoxSharedCrOpenGL_TEMPLATE = VBOXOGLR3HOST
     51VBoxSharedCrOpenGL_TEMPLATE = VBOXCROGLR3HOSTDLL
    8552ifdef VBOX_WITH_XPCOM
    8653 VBoxSharedCrOpenGL_DEFS = VBOX_WITH_XPCOM
    … …  
    10269        crserver/crservice.cpp
    10370VBoxSharedCrOpenGL_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSharedCrOpenGL.dylib
     71VBoxSharedCrOpenGL_LIBS = \
     72        $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
     73        $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
     74        $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
     75        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     76        $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
     77        $(VBOX_LIB_OGL_HOSTCRUTIL) \
     78        $(LIB_RUNTIME) \
     79        $(LIB_VMM)
    10480VBoxSharedCrOpenGL_LIBS.darwin = \
    10581        $(LIB_REM)
    10682ifeq ($(KBUILD_TARGET),win)
    107 VBoxSharedCrOpenGL_LIBS = \
    108         $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    109         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    110         $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
    111         $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
     83 VBoxSharedCrOpenGL_LIBS += \
    11284        $(PATH_OBJ)/VBoxOGLrenderspu/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
    113         $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
    114         $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
    11585        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls$(VBOX_SUFF_LIB)
    11686else
    11787 VBoxSharedCrOpenGL_LIBS += \
    118         $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
    119         $(PATH_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL) \
    120         $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
    121         $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    122         $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
    123         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    124         $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
    125 endif
    126 VBoxSharedCrOpenGL_LIBS += \
    127         $(LIB_RUNTIME) \
    128         $(LIB_VMM)
    129 
     88        $(PATH_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL)
     89endif
    13090
    13191#
    13292# VBoxOGLcrserverlib
    13393#
    134 VBoxOGLcrserverlib_TEMPLATE = VBOXOGLR3HOST
     94VBoxOGLcrserverlib_TEMPLATE = VBOXCROGLR3HOSTLIB
    13595VBoxOGLcrserverlib_INCS  = \
    13696        crserverlib
    … …  
    176136        $(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c \
    177137        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h
    178 ifeq ($(KBUILD_HOST),win)
    179  VBoxOGLcrserverlib_LIBS = \
    180         $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    181         $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    182         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    183         $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
    184         $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB)
    185 else
    186  VBoxOGLcrserverlib_LIBS = \
    187         $(PATH_BIN)/VBoxOGLhostcrpacker$(VBOX_SUFF_DLL) \
    188         $(PATH_BIN)/VBoxOGLhostspuload$(VBOX_SUFF_DLL) \
    189         $(PATH_BIN)/VBoxOGLcrunpacker$(VBOX_SUFF_DLL) \
    190         $(PATH_BIN)/VBoxOGLhostcrstate$(VBOX_SUFF_DLL) \
    191         $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
    192 endif
    193138
    194139#
    … …  
    196141#
    197142$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch_header.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    198         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     143        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    199144
    200145$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    201         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     146        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    202147
    203148$(VBOX_PATH_CROGL_GENFILES)/server_retval.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_retval.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    204         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     149        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    205150
    206151$(VBOX_PATH_CROGL_GENFILES)/server_get.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_get.py server_special get_components.py) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    207         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     152        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    208153
    209154$(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_simpleget.py get_sizes.py) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    210         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     155        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    211156
    212157
    … …  
    214159# VBoxOGLcrunpacker
    215160#
    216 VBoxOGLcrunpacker_TEMPLATE       = VBOXOGLR3HOST
     161VBoxOGLcrunpacker_TEMPLATE       = VBOXCROGLR3HOSTLIB
    217162VBoxOGLcrunpacker_INCS           = \
    218163        unpacker
    … …  
    249194        $(VBOX_PATH_CROGL_GENFILES)/unpack.c \
    250195        $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h
    251 ifeq ($(KBUILD_TARGET),win)
    252  VBoxOGLcrunpacker_LIBS = \
    253         $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    254         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    255         $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB)
    256 else
    257  VBoxOGLcrunpacker_LIBS = \
    258         $(PATH_BIN)/VBoxOGLhostcrpacker$(VBOX_SUFF_DLL) \
    259         $(PATH_BIN)/VBoxOGLhostspuload$(VBOX_SUFF_DLL) \
    260         $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
    261 endif
    262196
    263197#
    … …  
    265199#
    266200$(VBOX_PATH_CROGL_GENFILES)/unpack.c: $(addprefix $(PATH_SUB_CURRENT)/unpacker/, unpack.py unpacker_special) $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    267         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     201        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    268202
    269203$(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h: $(addprefix $(PATH_SUB_CURRENT)/unpacker/, unpack_extend.py unpacker_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    270         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     204        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    271205
    272206
    … …  
    274208# VBoxOGLrenderspu
    275209#
    276 VBoxOGLrenderspu_TEMPLATE = VBOXOGLR3HOST
     210VBoxOGLrenderspu_TEMPLATE = VBOXCROGLR3HOSTDLL
    277211VBoxOGLrenderspu_INTERMEDIATES = \
    278212        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
    … …  
    286220VBoxOGLrenderspu_SOURCES.solaris = render/renderspu_glx.c
    287221VBoxOGLrenderspu_SOURCES.darwin  = render/renderspu_agl.c
    288 
    289222VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib
    290 ifeq ($(KBUILD_TARGET),win)
    291  VBoxOGLrenderspu_LIBS += \
    292         $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    293         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB)
    294 else
    295  VBoxOGLrenderspu_LIBS += \
    296         $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL) \
    297         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB)
    298 endif
    299 VBoxOGLrenderspu_LIBS += \
     223VBoxOGLrenderspu_LIBS = \
     224        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     225        $(VBOX_LIB_OGL_HOSTCRUTIL) \
    300226        $(LIB_RUNTIME)
    301227if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
Note: See TracChangeset for help on using the changeset viewer.

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