VirtualBox

Ignore:
Timestamp:
Jan 26, 2009 5:14:44 PM (16 years ago)
Author:
vboxsync
Message:

crOpenGL: fix up additions burns (dll/lib paths) and cleanup host makefile as well

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r15532 r16241  
    2525include $(KBUILD_PATH)/subheader.kmk
    2626
    27 ifndef VBOX_BLD_PYTHON
    28         if1of ($(KBUILD_HOST), win)
    29                 VBOX_BLD_PYTHON := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/win.x86/python/v*/python$(HOSTSUFF_EXE))) python-not-found.exe)
    30         else
    31                 VBOX_BLD_PYTHON := python$(HOSTSUFF_EXE)
    32         endif
    33 endif
    34 
    35 GLAPI_PATH := $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/glapi_parser
    36 
    3727if1of ($(KBUILD_HOST), win)
    38         export PYTHONPATH := $(GLAPI_PATH);$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer;$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
     28 VBOX_CROGL_HOST_PYTHONPATH := $(VBOX_PATH_CROGL_GLAPI);$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer;$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
    3929else
    40         export PYTHONPATH := $(GLAPI_PATH):$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer:$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
    41 endif
    42 APIFILES := $(GLAPI_PATH)/apiutil.py $(GLAPI_PATH)/APIspec.txt
    43 
    44 VBOXCROGL_GENFILES      := VBoxOGLgen
    45 
    46 PATH_VBOXCROGL_GENFILES      := $(PATH_OBJ)/$(VBOXCROGL_GENFILES)
    47 PATH_VBOXCROGL_HOST_GENFILES := $(PATH_TARGET)/$(VBOXCROGL_GENFILES)
    48 PATH_VBOXCROGL_INCLUDE       := $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/include
     30 VBOX_CROGL_HOST_PYTHONPATH := $(VBOX_PATH_CROGL_GLAPI):$(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer:$(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib
     31endif
    4932
    5033VBOX_OPENGL_HEADERS = gl.h glu.h
    … …  
    7053TEMPLATE_VBOXOGLR3HOST_DEFS.solaris   = $(TEMPLATE_VBOXOGLR3HOST_DEFS) SunOS
    7154TEMPLATE_VBOXOGLR3HOST_DEFS.darwin    = $(TEMPLATE_VBOXOGLR3HOST_DEFS) DARWIN GL_GLEXT_LEGACY
    72 TEMPLATE_VBOXOGLR3HOST_INCS           = $(PATH_VBOXCROGL_INCLUDE) $(PATH_VBOXCROGL_GENFILES)
     55TEMPLATE_VBOXOGLR3HOST_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
    7356TEMPLATE_VBOXOGLR3HOST_DEPS.darwin    = $(addprefix $(VBOX_PATH_MACOSX_OPENGL)/,$(VBOX_OPENGL_HEADERS))
    7457TEMPLATE_VBOXOGLR3HOST_INCS.darwin    = $(VBOX_PATH_MACOSX_OPENGL)/..
    … …  
    7659TEMPLATE_VBOXOGLR3HOST_LDFLAGS.linux  = -Wl,--no-as-needed
    7760TEMPLATE_VBOXOGLR3HOST_LDFLAGS.darwin = -framework Carbon -framework OpenGL -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
    78 TEMPLATE_VBOXOGLR3HOST_BLDDIRS        = $(PATH_VBOXCROGL_HOST_GENFILES)/
     61TEMPLATE_VBOXOGLR3HOST_BLDDIRS        = $(VBOX_PATH_CROGL_GENFILES)/
    7962
    8063#
    … …  
    9881VBoxSharedCrOpenGL_SOURCES        += crserver/crservice.cpp
    9982VBoxSharedCrOpenGL_LIBS.win = \
    100         $(PATH_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
     83        $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    10184        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    10285        $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
    10386        $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    104         $(PATH_LIB)/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
     87        $(PATH_OBJ)/VBoxOGLrenderspu/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
    10588        $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
    10689        $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
    … …  
    124107#
    125108
    126 $(PATH_VBOXCROGL_HOST_GENFILES)/server_dispatch.h: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch_header.py server_special) $(APIFILES) | $$(dir $$@)
    127         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    128 
    129 $(PATH_VBOXCROGL_HOST_GENFILES)/server_dispatch.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch.py server_special) $(APIFILES) | $$(dir $$@)
    130         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    131 
    132 $(PATH_VBOXCROGL_HOST_GENFILES)/server_retval.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_retval.py server_special) $(APIFILES) | $$(dir $$@)
    133         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    134 
    135 $(PATH_VBOXCROGL_HOST_GENFILES)/server_get.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_get.py server_special get_components.py) $(APIFILES) | $$(dir $$@)
    136         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    137 
    138 $(PATH_VBOXCROGL_HOST_GENFILES)/server_simpleget.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_simpleget.py get_sizes.py) $(APIFILES) | $$(dir $$@)
    139         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    140 
    141 GEN_C_FILES := server_dispatch.c \
    142         server_retval.c \
    143         server_get.c \
    144         server_simpleget.c
    145 GEN_C_FILES := $(addprefix $(PATH_VBOXCROGL_HOST_GENFILES)/, $(GEN_C_FILES))
    146 
    147 GEN_H_FILES := server_dispatch.h
    148 GEN_H_FILES := $(addprefix $(PATH_VBOXCROGL_HOST_GENFILES)/, $(GEN_H_FILES))
    149 
    150 NORMAL_C_FILES := server_main.c \
    151         server_boundsinfo.c \
    152         server_bufferobject.c \
    153         server_clear.c \
    154         server_clip.c \
    155         server_config.c \
    156         server_context.c \
    157         server_gentextures.c \
    158         server_getmap.c \
    159         server_getstring.c \
    160         server_getpointer.c \
    161         server_getpixelmap.c \
    162         server_getteximage.c \
    163         server_lists.c \
    164         server_misc.c \
    165         server_occlude.c \
    166         server_papi.c \
    167         server_projmatrix.c \
    168         server_readpixels.c \
    169         server_stream.c \
    170         server_tiles.c \
    171         server_viewport.c \
    172         server_window.c \
    173         server_winpos.c \
    174         server_writeback.c
    175 NORMAL_C_FILES := $(addprefix crserverlib/, $(NORMAL_C_FILES))
    176 
    177109VBoxOGLcrserverlib_TEMPLATE = VBOXOGLR3HOST
    178 VBoxOGLcrserverlib_INCS := \
    179         $(PATH_SUB_CURRENT)/crserverlib \
    180         $(PATH_VBOXCROGL_HOST_GENFILES)
    181 VBoxOGLcrserverlib_INTERMEDIATES = $(PATH_VBOXCROGL_GENFILES)/spu_dispatch_table.h
    182 VBoxOGLcrserverlib_SOURCES := $(NORMAL_C_FILES) $(GEN_C_FILES)
    183 #VBoxOGLcrserverlib_SOURCES.win = crserverlib.def
    184 VBoxOGLcrserverlib_DEPS := \
    185         $(GEN_H_FILES) \
    186         $(PATH_VBOXCROGL_GENFILES)/state/cr_currentpointers.h \
    187         $(PATH_VBOXCROGL_GENFILES)/state/cr_statefuncs.h
    188 VBoxOGLcrserverlib_CLEAN := $(GEN_C_FILES) $(GEN_H_FILES)
     110VBoxOGLcrserverlib_INCS := $(PATH_SUB_CURRENT)/crserverlib
     111VBoxOGLcrserverlib_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
     112VBoxOGLcrserverlib_SOURCES := \
     113        crserverlib/server_main.c \
     114        crserverlib/server_boundsinfo.c \
     115        crserverlib/server_bufferobject.c \
     116        crserverlib/server_clear.c \
     117        crserverlib/server_clip.c \
     118        crserverlib/server_config.c \
     119        crserverlib/server_context.c \
     120        crserverlib/server_gentextures.c \
     121        crserverlib/server_getmap.c \
     122        crserverlib/server_getstring.c \
     123        crserverlib/server_getpointer.c \
     124        crserverlib/server_getpixelmap.c \
     125        crserverlib/server_getteximage.c \
     126        crserverlib/server_lists.c \
     127        crserverlib/server_misc.c \
     128        crserverlib/server_occlude.c \
     129        crserverlib/server_papi.c \
     130        crserverlib/server_projmatrix.c \
     131        crserverlib/server_readpixels.c \
     132        crserverlib/server_stream.c \
     133        crserverlib/server_tiles.c \
     134        crserverlib/server_viewport.c \
     135        crserverlib/server_window.c \
     136        crserverlib/server_winpos.c \
     137        crserverlib/server_writeback.c \
     138        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c \
     139        $(VBOX_PATH_CROGL_GENFILES)/server_retval.c \
     140        $(VBOX_PATH_CROGL_GENFILES)/server_get.c \
     141        $(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c
     142VBoxOGLcrserverlib_INTERMEDIATES := \
     143        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h \
     144        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
     145        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
     146VBoxOGLcrserverlib_CLEAN := \
     147        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c \
     148        $(VBOX_PATH_CROGL_GENFILES)/server_retval.c \
     149        $(VBOX_PATH_CROGL_GENFILES)/server_get.c \
     150        $(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c \
     151        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h
    189152VBoxOGLcrserverlib_LIBS.win = \
    190         $(PATH_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
     153        $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    191154        $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    192155        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    … …  
    202165endif
    203166
     167$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch_header.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     168        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     169
     170$(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_dispatch.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     171        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     172
     173$(VBOX_PATH_CROGL_GENFILES)/server_retval.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_retval.py server_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     174        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     175
     176$(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 $$@)
     177        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     178
     179$(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c: $(addprefix $(PATH_SUB_CURRENT)/crserverlib/, server_simpleget.py get_sizes.py) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     180        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     181
    204182#
    205183# VBoxOGLcrunpacker
    206184#
    207185
    208 $(PATH_VBOXCROGL_HOST_GENFILES)/unpack.c: $(addprefix $(PATH_SUB_CURRENT)/unpacker/, unpack.py unpacker_special) $(PATH_VBOXCROGL_HOST_GENFILES)/unpack_extend.h $(APIFILES) | $$(dir $$@)
    209         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    210 
    211 $(PATH_VBOXCROGL_HOST_GENFILES)/unpack_extend.h: $(addprefix $(PATH_SUB_CURRENT)/unpacker/, unpack_extend.py unpacker_special) $(APIFILES) | $$(dir $$@)
    212         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) $(<D) > $@
    213 
    214 GEN_C_FILES := unpack.c
    215 GEN_C_FILES := $(addprefix $(PATH_VBOXCROGL_HOST_GENFILES)/, $(GEN_C_FILES))
    216 
    217 GEN_H_FILES := unpack_extend.h
    218 GEN_H_FILES := $(addprefix $(PATH_VBOXCROGL_HOST_GENFILES)/, $(GEN_H_FILES))
    219 
    220 NORMAL_FILES := \
    221         unpack_arrays \
    222         unpack_bounds \
    223         unpack_bufferobject \
    224         unpack_calllists \
    225         unpack_clipplane \
    226         unpack_context \
    227         unpack_drawpixels \
    228         unpack_fence \
    229         unpack_fog \
    230         unpack_lights \
    231         unpack_map \
    232         unpack_materials \
    233         unpack_matrices \
    234         unpack_misc \
    235         unpack_pixelmap \
    236         unpack_point \
    237         unpack_program \
    238         unpack_readpixels \
    239         unpack_regcombiner \
    240         unpack_stipple \
    241         unpack_texture \
    242         unpack_writeback \
    243         unpack_visibleregion
    244 NORMAL_C_FILES := $(addsuffix .c, $(NORMAL_FILES))
    245 NORMAL_C_FILES := $(addprefix unpacker/, $(NORMAL_C_FILES))
    246 
    247 VBoxOGLcrunpacker_TEMPLATE = VBOXOGLR3HOST
    248 VBoxOGLcrunpacker_INCS := \
    249         $(PATH_SUB_CURRENT)/unpacker \
    250         $(PATH_VBOXCROGL_HOST_GENFILES)
    251 VBoxOGLcrunpacker_INTERMEDIATES = \
    252         $(PATH_VBOXCROGL_GENFILES)/spu_dispatch_table.h \
    253         $(PATH_VBOXCROGL_GENFILES)/cr_opcodes.h
    254 VBoxOGLcrunpacker_SOURCES   := $(NORMAL_C_FILES) $(GEN_C_FILES)
    255 #VBoxOGLcrunpacker_SOURCES.win = unpack.def
    256 VBoxOGLcrunpacker_DEPS      := $(GEN_H_FILES)
    257 VBoxOGLcrunpacker_CLEAN     := $(GEN_C_FILES) $(GEN_H_FILES)
    258 VBoxOGLcrunpacker_LIBS.win   = \
    259         $(PATH_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
     186VBoxOGLcrunpacker_TEMPLATE       = VBOXOGLR3HOST
     187VBoxOGLcrunpacker_INCS          := $(PATH_SUB_CURRENT)/unpacker
     188VBoxOGLcrunpacker_INTERMEDIATES  = \
     189        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h \
     190        $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \
     191        $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h
     192VBoxOGLcrunpacker_SOURCES       := \
     193        unpacker/unpack_arrays.c \
     194        unpacker/unpack_bounds.c \
     195        unpacker/unpack_bufferobject.c \
     196        unpacker/unpack_calllists.c \
     197        unpacker/unpack_clipplane.c \
     198        unpacker/unpack_context.c \
     199        unpacker/unpack_drawpixels.c \
     200        unpacker/unpack_fence.c \
     201        unpacker/unpack_fog.c \
     202        unpacker/unpack_lights.c \
     203        unpacker/unpack_map.c \
     204        unpacker/unpack_materials.c \
     205        unpacker/unpack_matrices.c \
     206        unpacker/unpack_misc.c \
     207        unpacker/unpack_pixelmap.c \
     208        unpacker/unpack_point.c \
     209        unpacker/unpack_program.c \
     210        unpacker/unpack_readpixels.c \
     211        unpacker/unpack_regcombiner.c \
     212        unpacker/unpack_stipple.c \
     213        unpacker/unpack_texture.c \
     214        unpacker/unpack_writeback.c \
     215        unpacker/unpack_visibleregion.c \
     216        $(VBOX_PATH_CROGL_GENFILES)/unpack.c
     217VBoxOGLcrunpacker_CLEAN         := \
     218        $(VBOX_PATH_CROGL_GENFILES)/unpack.c \
     219        $(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h
     220VBoxOGLcrunpacker_LIBS.win       = \
     221        $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    260222        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    261223        $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB)
    … …  
    266228        $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
    267229endif
     230
     231$(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 $$@)
     232        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     233
     234$(VBOX_PATH_CROGL_GENFILES)/unpack_extend.h: $(addprefix $(PATH_SUB_CURRENT)/unpacker/, unpack_extend.py unpacker_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     235        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_CROGL_HOST_PYTHONPATH),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
    268236
    269237#
    … …  
    283251VBoxOGLrenderspu_SOURCES.darwin  = render/renderspu_agl.c
    284252VBoxOGLrenderspu_LIBS.win      = \
    285         $(PATH_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
     253        $(PATH_OBJ)/VBoxOGLhostcrutil/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
    286254        $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB)
    287 
    288255if1of ($(KBUILD_TARGET), linux solaris darwin)
    289256 VBoxOGLrenderspu_LIBS += \
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