Changeset 16281 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jan 27, 2009 9:50:20 PM (16 years ago)

Author:

vboxsync

Message:

SharedOpenGL/Makefile.kmk: Use an installation target, that way we'll get proper dependencies on the symlink target.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (2 diffs)

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

@@ -54 +54 @@
 TEMPLATE_VBOXOGLR3HOST_DEFS.solaris   = SunOS
 TEMPLATE_VBOXOGLR3HOST_DEFS.darwin    = DARWIN GL_GLEXT_LEGACY
-TEMPLATE_VBOXOGLR3HOST_INCS.darwin    = $(VBOX_PATH_DARWIN_OPENGL)/..
-TEMPLATE_VBOXOGLR3HOST_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
-## @todo r=bird: try INTERMEDIATES.darwin here.
-TEMPLATE_VBOXOGLR3HOST_DEPS.darwin    = $(addprefix $(VBOX_PATH_DARWIN_OPENGL)/,$(VBOX_DARWIN_OPENGL_HEADERS))
+TEMPLATE_VBOXOGLR3HOST_INCS           = \
+        $(VBOX_PATH_CROGL_INCLUDE) \
+        $(VBOX_PATH_CROGL_GENFILES)
 TEMPLATE_VBOXOGLR3HOST_LDFLAGS.linux  = -Wl,--no-as-needed
 TEMPLATE_VBOXOGLR3HOST_LDFLAGS.darwin = -framework Carbon -framework OpenGL -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
@@ -64 +63 @@
 
 ifeq ($(KBUILD_TARGET),darwin)
-#
-# We have to symlink the system headers of OpenGl cause they have some
-# different directory hierarchy on Mac OS X (no /GL sub directory).
-#
-VBOX_DARWIN_OPENGL_HEADERS := gl.h glu.h
-VBOX_PATH_DARWIN_OPENGL    := $(PATH_OBJ)/VBoxOGL/GL
-
-$(foreach hdr, $(VBOX_DARWIN_OPENGL_HEADERS), \
-$(VBOX_PATH_DARWIN_OPENGL)/$(hdr): \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/$(hdr) \
-        | $(VBOX_PATH_DARWIN_OPENGL)/ \
-        ; $$(LN_SYMLINK) $$< $$@ \
-$(NL))
+ #
+ # We have to symlink the system headers of OpenGl cause they have some
+ # different directory hierarchy on Mac OS X (no /GL sub directory).
+ #
+ VBOX_DARWIN_OPENGL_HEADERS := gl.h glu.h
+ VBOX_PATH_DARWIN_OPENGL    := $(PATH_OUT)/obj/VBoxOGL/GL
+
+ # Install target for creating the symlinks.
+ INSTALLS += DarwinOpenGLHdrs
+ DarwinOpenGLHdrs_INST := \
+        $(patsubst $(PATH_OUT)/%,%/,$(VBOX_PATH_DARWIN_OPENGL))
+ DarwinOpenGLHdrs_SYMLINKS := \
+        $(foreach hdr, $(VBOX_DARWIN_OPENGL_HEADERS),\
+                $(hdr)=>$(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/$(hdr))
+
+ # Update the template.
+ TEMPLATE_VBOXOGLR3HOST_INCS.darwin := \
+        $(dir $(VBOX_PATH_DARWIN_OPENGL))
+ TEMPLATE_VBOXOGLR3HOST_INTERMEDIATES.darwin := \
+        $(addprefix $(VBOX_PATH_DARWIN_OPENGL)/./,$(VBOX_DARWIN_OPENGL_HEADERS))
+
 endif # darwin