Changeset 16285 in vbox

Timestamp:

Jan 27, 2009 11:19:03 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42108

Message:

darwin build fix.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -56 +56 @@
 # Temporary hack for kBuild ticket #83.
 ## @todo kBuild: remove after closing ticket #83.
+PROPS_ACCUMULATE_L += INTERMEDIATES
 PROPS_ACCUMULATE_L_LNK       += INTERMEDIATES
 PROPS_PROGRAMS_ACCUMULATE_L  += INTERMEDIATES
@@ -1428 +1429 @@
 #
 ifdef VBOX_WITH_CROGL
- VBOX_PATH_CROGL_GLAPI      = $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/glapi_parser
- VBOX_PATH_CROGL_GENFILES   = $(PATH_OBJ)/VBoxOGLgen
- VBOX_PATH_CROGL_INCLUDE    = $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/include
- VBOX_CROGL_API_FILES       = $(VBOX_PATH_CROGL_GLAPI)/apiutil.py $(VBOX_PATH_CROGL_GLAPI)/APIspec.txt
- VBOX_CROGL_PYTHON_ENV      = $(REDIRECT) $(if $1,-E 'PYTHONPATH=$1',) $(if $2,-o $2,) $(if $3,-i $3) --
-
- SDK_DARWIN-OPENGL          = Workaround SDK for the darwin OpenGL include directorly layout layout.
- SDK_DARWIN-OPENGL_INCS     = $(PATH_OUT)/obj/VBoxOGL
- SDK_DARWIN-OPENGL_INTERMEDIATES = $(addprefix $(VBOX_PATH_DARWIN_OPENGL)/./,$(VBOX_DARWIN_OPENGL_HEADERS))
- VBOX_DARWIN_OPENGL_INST    = obj/VBoxOGL/GL/
- VBOX_DARWIN_OPENGL_HEADERS = gl.h glu.h
+ VBOX_PATH_CROGL_GLAPI       = $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/glapi_parser
+ VBOX_PATH_CROGL_GENFILES    = $(PATH_OBJ)/VBoxOGLgen
+ VBOX_PATH_CROGL_INCLUDE     = $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/include
+ VBOX_CROGL_API_FILES        = $(VBOX_PATH_CROGL_GLAPI)/apiutil.py $(VBOX_PATH_CROGL_GLAPI)/APIspec.txt
+ VBOX_CROGL_PYTHON_ENV       = $(REDIRECT) $(if $1,-E 'PYTHONPATH=$1',) $(if $2,-o $2,) $(if $3,-i $3) --
+
+ VBOX_DARWIN_OPENGL_INST     = obj/VBoxOGL/GL/
+ VBOX_DARWIN_OPENGL_HEADERS  = gl.h glu.h
+ SDK_DARWIN-OPENGL           = Workaround SDK for the darwin OpenGL include directorly layout layout.
+ SDK_DARWIN-OPENGL_INCS      = $(PATH_OUT)/obj/VBoxOGL
+ SDK_DARWIN-OPENGL_ORDERDEPS = $(addprefix $(PATH_OUT)/obj/VBoxOGL/GL/./,$(VBOX_DARWIN_OPENGL_HEADERS))
+ ## @todo kBuild: Using INTERMEDIATES doesn't work!
 endif
 

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -360 +360 @@
         state_tracker
 VBoxOGLcrstate_INTERMEDIATES = \
-        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
+        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h \
+        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
+        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
 VBoxOGLcrstate_SOURCES = \
         state_tracker/state_attrib.c \

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

@@ -70 +70 @@
  #
  INSTALLS += DarwinOpenGLHdrs
- DarwinOpenGLHdrs_INST     = $(VBOX_DARWIN_OPENGL_INST)/
+ DarwinOpenGLHdrs_INST     = $(VBOX_DARWIN_OPENGL_INST)
  DarwinOpenGLHdrs_SYMLINKS = \
         $(foreach hdr, $(VBOX_DARWIN_OPENGL_HEADERS),\