Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add rust-core-graphics as dependency of rust-layers on Mac. Add trailing NULLs to sub.mk.

Browse source
This commit is contained in:
Brian J. Burg 2012-11-05 12:35:14 -08:00
parent 853f0474ea
commit ca1269bbad
1 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

59
mk/sub.mk
View file

@ -11,7 +11,8 @@ DEPS_rust-azure += \
$(NULL) $(NULL)
DEPS_rust-glut += \ DEPS_rust-glut += \
rust-opengles rust-opengles \
$(NULL)
DEPS_rust-layers += \ DEPS_rust-layers += \
rust-azure \ rust-azure \
@ -23,57 +24,77 @@ DEPS_rust-layers += \
DEPS_sharegl += \ DEPS_sharegl += \
rust-geom \ rust-geom \
rust-opengles rust-opengles \
$(NULL)
DEPS_rust-hubbub += \ DEPS_rust-hubbub += \
libhubbub libhubbub \
$(NULL)
DEPS_rust-netsurfcss += \ DEPS_rust-netsurfcss += \
libcss \ libcss \
rust-wapcaplet rust-wapcaplet \
$(NULL)
DEPS_rust-wapcaplet += \ DEPS_rust-wapcaplet += \
libwapcaplet libwapcaplet \
$(NULL)
CFLAGS_rust-wapcaplet += \ CFLAGS_rust-wapcaplet += \
"-I$(S)src/libwapcaplet/include" "-I$(S)src/libwapcaplet/include" \
$(NULL)
DEPS_rust-css += \ DEPS_rust-css += \
rust-netsurfcss \ rust-netsurfcss \
rust-wapcaplet rust-wapcaplet \
$(NULL)
CFLAGS_mozjs += \ CFLAGS_mozjs += \
"-I../mozjs/dist/include" "-I../mozjs/dist/include" \
$(NULL)
DEPS_rust-mozjs += \ DEPS_rust-mozjs += \
mozjs mozjs \
$(NULL)
CFLAGS_rust-mozjs += \ CFLAGS_rust-mozjs += \
"-I../mozjs/dist/include" "-I../mozjs/dist/include" \
$(NULL)
DEPS_libcss += \ DEPS_libcss += \
libwapcaplet \ libwapcaplet \
libparserutils libparserutils \
$(NULL)
# Platform-specific dependencies # Platform-specific dependencies
ifeq ($(CFG_OSTYPE),darwin) ifeq ($(CFG_OSTYPE),darwin)
DEPS_rust-azure += \ DEPS_rust-azure += \
rust-core-graphics \ rust-core-graphics \
rust-core-foundation rust-core-foundation \
$(NULL)
DEPS_rust-cairo += \ DEPS_rust-cairo += \
rust-core-graphics rust-core-graphics \
$(NULL)
DEPS_rust-io-surface += \ DEPS_rust-io-surface += \
rust-core-foundation rust-core-foundation \
$(NULL)
DEPS_sharegl += \ DEPS_sharegl += \
rust-core-foundation \ rust-core-foundation \
rust-io-surface rust-io-surface \
$(NULL)
DEPS_rust-core-text += \ DEPS_rust-core-text += \
rust-core-foundation \ rust-core-foundation \
rust-core-graphics rust-core-graphics \
$(NULL)
DEPS_rust-layers += \
rust-core-graphics \
$(NULL)
endif endif
ifeq ($(CFG_OSTYPE),linux) ifeq ($(CFG_OSTYPE),linux)
@ -82,17 +103,17 @@ DEPS_rust-cairo += \
rust-freetype \ rust-freetype \
rust-fontconfig \ rust-fontconfig \
rust-xlib \ rust-xlib \
$(NONE) $(NULL)
DEPS_rust-azure += \ DEPS_rust-azure += \
rust-freetype \ rust-freetype \
rust-fontconfig \ rust-fontconfig \
rust-xlib \ rust-xlib \
$(NONE) $(NULL)
# See note at top of file # See note at top of file
DEPS_rust-layers += \ DEPS_rust-layers += \
rust-freetype \ rust-freetype \
rust-fontconfig \ rust-fontconfig \
$(NONE) $(NULL)
endif endif