vbox的更動 16284 路徑 trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

時間撮記:

2009-1-27 下午10:18:43 (16 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk (修改) (8 筆差異)

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 = \