Changeset 16284 in vbox

Timestamp:

Jan 27, 2009 10:18:43 PM (16 years ago)

Author:

vboxsync

Message:

Config.kmk,OGL/Makefiles: Created a DARWIN-OPENGL SDK for the GL/gl[u].h hack.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -1428 +1428 @@
 #
 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) --
+ 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
 endif
 

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

@@ -65 +65 @@
 TEMPLATE_VBOXCROGLR3HOST_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY
 TEMPLATE_VBOXCROGLR3HOST_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
-TEMPLATE_VBOXCROGLR3HOST_INCS.darwin    = $(PATH_OUT)/obj/VBoxOGL
+TEMPLATE_VBOXCROGLR3HOST_SDKS.darwin    = $(VBOXR3NP_SDKS.darwin) DARWIN-OPENGL
 TEMPLATE_VBOXCROGLR3HOST_LDFLAGS.darwin = -framework Carbon -framework OpenGL -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
+TEMPLATE_VBOXCROGLR3HOST_LDFLAGS.linux  = $(TEMPLATE_VBOXR3NP_LDFLAGS.linux) -Wl,--no-as-needed
 TEMPLATE_VBOXCROGLR3HOST_BLDDIRS        = $(VBOX_PATH_CROGL_GENFILES)/
 
@@ -78 +79 @@
 TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY
 TEMPLATE_VBOXCROGLR3GUESTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
-TEMPLATE_VBOXCROGLR3GUESTDLL_INCS.darwin    = $(PATH_OUT)/obj/VBoxOGL
+TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin    = $(VBOXGUESTR3NPDLL_SDKS.darwin) DARWIN-OPENGL
 TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin = -framework Carbon -framework OpenGL -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
 TEMPLATE_VBOXCROGLR3GUESTDLL_BLDDIRS        = $(VBOX_PATH_CROGL_GENFILES)/
@@ -240 +241 @@
         $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \
         $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h
+## @todo r=bird: Why does a library target have LIBS?
 ifeq ($(KBUILD_TARGET),win)
  VBoxOGLcrpacker_LIBS = \
@@ -253 +255 @@
 VBoxOGLhostcrpacker_EXTENDS  = VBoxOGLcrpacker
 VBoxOGLhostcrpacker_TEMPLATE = VBOXCROGLR3HOST
-## @todo r=bird: this is used by all VBOXCROGLR3HOST users execpt VBoxOGLhostcrutil. Any reason why it's not using it? If not, then move it to the template.
-VBoxOGLhostcrpacker_LDFLAGS.linux += -Wl,--no-as-needed
+## @todo r=bird: Why does a library target have LIBS?
 ifeq ($(KBUILD_TARGET),win)
  VBoxOGLhostcrpacker_LIBS = \
@@ -325 +326 @@
 VBoxOGLhostspuload_EXTENDS  = VBoxOGLspuload
 VBoxOGLhostspuload_TEMPLATE = VBOXCROGLR3HOST
-VBoxOGLhostspuload_LDFLAGS.linux += -Wl,--no-as-needed
 ifeq ($(KBUILD_TARGET),win)
  VBoxOGLhostspuload_LIBS.win = \
@@ -444 +444 @@
         $(VBoxOGLcrstate_SOURCES) \
         state_tracker/state_snapshot.c
-VBoxOGLhostcrstate_LDFLAGS.linux += -Wl,--no-as-needed
 ifeq ($(KBUILD_TARGET),win)
  VBoxOGLhostcrstate_LIBS = \
@@ -518 +517 @@
 #
 VBoxOGLerrorspu_TEMPLATE = VBOXCROGLR3GUESTDLL
-VBoxOGLerrorspu_INTERMEDIATES.darwin = \
-        $(PATH_OUT)/obj/VBoxOGL/GL/./gl.h \
-        $(PATH_OUT)/obj/VBoxOGL/GL/./glu.h
 VBoxOGLerrorspu_INTERMEDIATES = \
         $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
@@ -546 +542 @@
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLhosterrorspu.dylib \
         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
-VBoxOGLhosterrorspu_LDFLAGS.linux += -Wl,--no-as-needed
 ifeq ($(KBUILD_TARGET),win)
  VBoxOGLhosterrorspu_LIBS = \

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

@@ -54 +54 @@
 TEMPLATE_VBOXOGLR3HOST_DEFS.solaris   = SunOS
 TEMPLATE_VBOXOGLR3HOST_DEFS.darwin    = DARWIN GL_GLEXT_LEGACY
+TEMPLATE_VBOXOGLR3HOST_SDKS.darwin   += $(VBOXR3NP_SDKS.darwin) DARWIN-OPENGL
 TEMPLATE_VBOXOGLR3HOST_INCS           = \
         $(VBOX_PATH_CROGL_INCLUDE) \
@@ -66 +67 @@
  # 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.
+ # See Config.kmk for the global variables.
+ #
  INSTALLS += DarwinOpenGLHdrs
- DarwinOpenGLHdrs_INST := \
-        $(patsubst $(PATH_OUT)/%,%/,$(VBOX_PATH_DARWIN_OPENGL))
- DarwinOpenGLHdrs_SYMLINKS := \
+ DarwinOpenGLHdrs_INST     = $(VBOX_DARWIN_OPENGL_INST)/
+ 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))
- TEMPLATE_VBOXOGLR3HOST_BLDDIRS.darwin = \
-        $(VBOX_PATH_DARWIN_OPENGL)
 endif # darwin