Changeset 16287 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jan 27, 2009 11:40:04 PM (16 years ago)

Author:

vboxsync

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

42110

Message:

GuestHost/OGL/Makefile: using EXTENDS_BY = prepending is simpler here.

File:

• trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk (modified) (1 diff)

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

@@ -57 +57 @@
 TEMPLATE_VBOXCROGLR3HOST                    = VBox OpenGL Host DLLs/Libraries
 TEMPLATE_VBOXCROGLR3HOST_EXTENDS            = VBOXR3NP
-TEMPLATE_VBOXCROGLR3HOST_DEFS               = $(TEMPLATE_VBOXR3NP_DEFS) CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
-TEMPLATE_VBOXCROGLR3HOST_DEFS.win           = $(TEMPLATE_VBOXR3NP_DEFS.win)     _WIN32_WINNT=0x0500 WINDOWS=1
-TEMPLATE_VBOXCROGLR3HOST_DEFS.linux         = $(TEMPLATE_VBOXR3NP_DEFS.linux)   Linux=1
-TEMPLATE_VBOXCROGLR3HOST_DEFS.solaris       = $(TEMPLATE_VBOXR3NP_DEFS.solaris) SunOS=1 GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3HOST_DEFS.darwin        = $(TEMPLATE_VBOXR3NP_DEFS.darwin)  DARWIN=1 GL_GLEXT_LEGACY
-TEMPLATE_VBOXCROGLR3HOST_INCS               = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES) $(TEMPLATE_VBOXR3NP_INCS)
-TEMPLATE_VBOXCROGLR3HOST_SDKS.darwin        = DARWIN-OPENGL $(TEMPLATE_VBOXR3NP_SDKS.darwin)
-TEMPLATE_VBOXCROGLR3HOST_LDFLAGS.darwin     = $(TEMPLATE_VBOXR3NP_LDFLAGS) \
+TEMPLATE_VBOXCROGLR3HOST_EXTENDS_BY         = prepending
+TEMPLATE_VBOXCROGLR3HOST_DEFS               = CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
+TEMPLATE_VBOXCROGLR3HOST_DEFS.win           = _WIN32_WINNT=0x0500 WINDOWS=1
+TEMPLATE_VBOXCROGLR3HOST_DEFS.linux         = Linux=1
+TEMPLATE_VBOXCROGLR3HOST_DEFS.solaris       = SunOS=1 GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3HOST_DEFS.darwin        = DARWIN=1 GL_GLEXT_LEGACY
+TEMPLATE_VBOXCROGLR3HOST_INCS               = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
+TEMPLATE_VBOXCROGLR3HOST_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            = $(TEMPLATE_VBOXR3NP_BLDDIRS) $(VBOX_PATH_CROGL_GENFILES)/
+TEMPLATE_VBOXCROGLR3HOST_LDFLAGS.linux      = -Wl,--no-as-needed
+TEMPLATE_VBOXCROGLR3HOST_BLDDIRS            = $(VBOX_PATH_CROGL_GENFILES)/
 
 TEMPLATE_VBOXCROGLR3GUESTDLL                = VBox OpenGL Guest DLLs
 TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS        = VBOXGUESTR3NPDLL
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS           = $(TEMPLATE_VBOXGUESTR3NPDLL_DEFS) CHROMIUM_THREADSAFE VBOX_WITH_HGCM
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.win       = $(TEMPLATE_VBOXGUESTR3NPDLL_DEFS.win)     _WIN32_WINNT=0x0500 WINDOWS=1
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.linux     = $(TEMPLATE_VBOXGUESTR3NPDLL_DEFS.linux)   Linux=1
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris   = $(TEMPLATE_VBOXGUESTR3NPDLL_DEFS.solaris) SunOS=1 GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = $(TEMPLATE_VBOXGUESTR3NPDLL_DEFS.darwin)  DARWIN=1 GL_GLEXT_LEGACY
-TEMPLATE_VBOXCROGLR3GUESTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES) $(TEMPLATE_VBOXGUESTR3NPDLL_INCS)
-TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin    = DARWIN-OPENGL $(TEMPLATE_VBOXGUESTR3NPDLL_SDKS.darwin)
-TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin = $(TEMPLATE_VBOXGUESTR3NPDLL_LDFLAGS.darwin) \
+TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS_BY     = prepending
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS           = CHROMIUM_THREADSAFE VBOX_WITH_HGCM
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.win       = _WIN32_WINNT=0x0500 WINDOWS=1
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.linux     = Linux=1
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris   = SunOS=1 GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY
+TEMPLATE_VBOXCROGLR3GUESTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
+TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin    = DARWIN-OPENGL
+TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin = \
         -framework Carbon \
         -framework OpenGL \