diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
commit | d7609640e7cb9d213b9d3cbcf9394c677719d369 (patch) | |
tree | 1487faa310e5f6dd91a5d033644abb470b8f3719 /arch/sandbox/os/Makefile | |
parent | d1e65d2a7bd9162e7009da870adb15c70b620320 (diff) | |
parent | 9d73b518fc3c61640123f8499aab7f8373e41dbd (diff) | |
download | barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.gz barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.xz |
Merge branch 'for-next/sandbox'
Conflicts:
arch/sandbox/mach-sandbox/include/mach/linux.h
Diffstat (limited to 'arch/sandbox/os/Makefile')
-rw-r--r-- | arch/sandbox/os/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index dc211d94cd..2e65be5eed 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -13,3 +13,5 @@ NOSTDINC_FLAGS := obj-y = common.o tap.o +CFLAGS_sdl.o = $(shell pkg-config sdl --cflags) +obj-$(CONFIG_DRIVER_VIDEO_SDL) += sdl.o |