Changeset 23133 in vbox

Timestamp:

Sep 18, 2009 2:11:55 PM (16 years ago)

Author:

vboxsync

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

52531

Message:

crOpenGL-OSX: little cleanup

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -3605 +3605 @@
 # Template for building OpenGL host dlls.
 #
-TEMPLATE_VBOXCROGLR3HOSTDLL                = VBox OpenGL Host DLLs
-TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS        = VBOXR3NP
-TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY     = prepending
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS           = CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win       = _WIN32_WINNT=0x0500 WINDOWS=1
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux     = Linux=1 _GNU_SOURCE
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris   = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3HOSTDLL                  = VBox OpenGL Host DLLs
+TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS          = VBOXR3NP
+TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY       = prepending
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS             = CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win         = _WIN32_WINNT=0x0500 WINDOWS=1
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux       = Linux=1 _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris     = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
 ifdef VBOX_WITH_COCOA_QT
- TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin  += VBOX_WITH_COCOA_QT
-endif
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.freebsd   = FreeBSD=1 _GNU_SOURCE
-TEMPLATE_VBOXCROGLR3HOSTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
-TEMPLATE_VBOXCROGLR3HOSTDLL_SDKS.darwin    = DARWIN-OPENGL
-TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin = \
-        -framework Carbon \
+ TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin    += VBOX_WITH_COCOA_QT
+ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  = -framework AppKit
+else
+ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  = -framework Carbon
+endif
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3HOSTDLL_INCS             = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
+TEMPLATE_VBOXCROGLR3HOSTDLL_SDKS.darwin      = DARWIN-OPENGL
+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  += \
         -framework OpenGL \
         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
-TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux      = -Wl,--no-as-needed
-TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS            = $(VBOX_PATH_CROGL_GENFILES)/
+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux    = -Wl,--no-as-needed
+TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS          = $(VBOX_PATH_CROGL_GENFILES)/
 
 #
@@ -3640 +3642 @@
 # Template for building OpenGL guest dlls.
 #
-TEMPLATE_VBOXCROGLR3GUESTDLL                = VBox OpenGL Guest DLLs
-TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS        = VBOXGUESTR3NPDLL
-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 _GNU_SOURCE
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris   = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3GUESTDLL                  = VBox OpenGL Guest DLLs
+TEMPLATE_VBOXCROGLR3GUESTDLL_EXTENDS          = VBOXGUESTR3NPDLL
+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 _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris     = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
 ifdef VBOX_WITH_COCOA_QT
- TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin  += VBOX_WITH_COCOA_QT
-endif
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.freebsd   = FreeBSD=1 _GNU_SOURCE
-TEMPLATE_VBOXCROGLR3GUESTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
-TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin    = DARWIN-OPENGL
-TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin = \
-        -framework Carbon \
+ TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    += VBOX_WITH_COCOA_QT
+ TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin  = -framework AppKit
+else
+ TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin  = -framework Carbon
+endif
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
+TEMPLATE_VBOXCROGLR3GUESTDLL_INCS             = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
+TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin      = DARWIN-OPENGL
+TEMPLATE_VBOXCROGLR3GUESTDLL_LDFLAGS.darwin  += \
         -framework OpenGL \
         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
-TEMPLATE_VBOXCROGLR3GUESTDLL_BLDDIRS        = $(VBOX_PATH_CROGL_GENFILES)/
+TEMPLATE_VBOXCROGLR3GUESTDLL_BLDDIRS          = $(VBOX_PATH_CROGL_GENFILES)/
 
 #

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

@@ -238 +238 @@
     render/renderspu_cocoa.c \
     render/renderspu_cocoa_helper.m
- VBoxOGLrenderspu_LDFLAGS.darwin += -framework AppKit
 else
  VBoxOGLrenderspu_SOURCES.darwin = render/renderspu_agl.c