diff options
| author | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
|---|---|---|
| committer | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
| commit | c51b1189e3d5353e842991f5859ddcea0f73e426 (patch) | |
| tree | ef2cb8a6184699aa614f3655dca4ce661cdc108e /Makefile.include.in | |
| parent | be61ebdc9e897fe40c6f371111724de79ddee8d5 (diff) | |
Merged cptspiff's code-reshuffle branch.
Squashed commit due to build breakage during code-reshuffle history.
Conflicts:
xbmc/Util.cpp
xbmc/cdrip/CDDARipper.cpp
xbmc/filesystem/Directory.cpp
xbmc/filesystem/File.cpp
Diffstat (limited to 'Makefile.include.in')
| -rw-r--r-- | Makefile.include.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.include.in b/Makefile.include.in index 66c8e0039e..0dba3ed970 100644 --- a/Makefile.include.in +++ b/Makefile.include.in @@ -32,6 +32,10 @@ CXXFLAGS+=@CXXFLAGS@ CFLAGS+=@CFLAGS@ LDFLAGS+=@LDFLAGS@ INCLUDES+=$(sort @INCLUDES@) +INCLUDES+=-I@abs_top_srcdir@/lib +INCLUDES+=-I@abs_top_srcdir@/xbmc +INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg +INCLUDES+=-I@abs_top_srcdir@/xbmc/linux DEFINES+= \ -D_LINUX \ -D_FILE_DEFINED \ @@ -44,6 +48,7 @@ DEFINES+= \ ifeq ($(findstring osx,$(ARCH)), osx) export MACOSX_DEPLOYMENT_TARGET=10.4 + INCLUDES+=-I@abs_top_srcdir@/xbmc/osx endif ifeq ($(ARCH), powerpc-osx) |