Changeset 26016 in vbox
- Timestamp:
- Jan 25, 2010 4:02:14 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 56901
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r25952 r26016 3770 3770 # 3771 3771 TEMPLATE_VBOXCROGLR3HOSTLIB = VBox OpenGL Host Libraries 3772 TEMPLATE_VBOXCROGLR3HOSTLIB_EXTENDS = VBOXCROGLR3GUESTDLL 3773 # fixme? Without next line VBoxOGLhostcrstate and other host libs from src/VBox/GuestHost/OpenGL/makefile.kmk 3774 # would be compiled with defines from VBOXGUESTR3NPDLL, like IN_GUEST etc. 3775 # Also need to specify IN_RING3 because EXTENDS_BY=prepending can't be used due to the reason above. 3776 TEMPLATE_VBOXCROGLR3HOSTLIB_DEFS = IN_RING3 $(TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS) 3772 TEMPLATE_VBOXCROGLR3HOSTLIB_EXTENDS = VBOXCROGLR3HOSTDLL 3777 3773 TEMPLATE_VBOXCROGLR3HOSTLIB_INST = $(INST_LIB) 3778 3774 -
trunk/src/libs/xpcom18a4/Makefile.kmk
r25788 r26016 213 213 TEMPLATE_XPCOMBLDPROG_EXTENDS = VBOXBLDPROG 214 214 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.) 215 TEMPLATE_XPCOMBLDPROG_DEFS = $(TEMPLATE_ BLDPROG_DEFS) $(TEMPLATE_XPCOMEXE_DEFS)216 TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_ BLDPROG_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))217 TEMPLATE_XPCOMBLDPROG_DEFS.x86 = $(TEMPLATE_ BLDPROG_DEFS.x86) $(TEMPLATE_XPCOMEXE_DEFS.x86)218 TEMPLATE_XPCOMBLDPROG_DEFS.amd64 = $(TEMPLATE_ BLDPROG_DEFS.amd64) $(TEMPLATE_XPCOMEXE_DEFS.amd64)215 TEMPLATE_XPCOMBLDPROG_DEFS = $(TEMPLATE_VBOXBLDPROG_DEFS) $(TEMPLATE_XPCOMEXE_DEFS) 216 TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBOXBLDPROG_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST)) 217 TEMPLATE_XPCOMBLDPROG_DEFS.x86 = $(TEMPLATE_VBOXBLDPROG_DEFS.x86) $(TEMPLATE_XPCOMEXE_DEFS.x86) 218 TEMPLATE_XPCOMBLDPROG_DEFS.amd64 = $(TEMPLATE_VBOXBLDPROG_DEFS.amd64) $(TEMPLATE_XPCOMEXE_DEFS.amd64) 219 219 TEMPLATE_XPCOMBLDPROG_INCS = \ 220 220 $(VBOX_PATH_SDK)/bindings/xpcom/include \ … … 223 223 $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ 224 224 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd 225 TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_ BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast)226 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_ BLDPROG_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti227 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_ BLDPROG_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway.228 TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_ BLDPROG_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions225 TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format 226 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti 227 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway. 228 TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions 229 229 TEMPLATE_XPCOMBLDPROG_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) 230 230
Note:
See TracChangeset
for help on using the changeset viewer.