diff options
| author | davilla <davilla@svn> | 2010-06-12 03:34:09 +0000 |
|---|---|---|
| committer | davilla <davilla@svn> | 2010-06-12 03:34:09 +0000 |
| commit | 8cae4e81fbc92de58d1041a487ef8e5ad1256cdb (patch) | |
| tree | d9c6b230bf96cd6722a862c38ab19564bea68d2d /Makefile.in | |
| parent | 077277191fdda8e536248fdcd613020d9237a4f6 (diff) | |
[osx] 1) remove ARCH_DEFINES usage, it's redundent, 2) libmodplug-xxx.so was not being build with make, 3) cosmetic restore xcode_depends items, 4) remove useless CXXFLAGS from link line and move LDFLAGS to the front where it matters
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31041 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index eb0d2ec0a9..8fa6fc00e2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -371,16 +371,18 @@ imagelib: dllloader $(MAKE) -C xbmc/lib/cximage-6.0 codecs: papcodecs dvdpcodecs +ifeq ($(findstring osx,$(ARCH)), osx) +libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so system/players/paplayer/libmodplug-$(ARCH).so +else libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so +endif externals: codecs libs python visualizations screensavers xcode_depends: \ - codecs libs python visualizations screensavers eventclients \ - xbmc/lib/libsquish/libsquish-@ARCH@.a \ - skins \ + codecs libs python visualizations screensavers eventclients skins \ xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a \ + xbmc/lib/libsquish/libsquish-@ARCH@.a \ xbmc/lib/libapetag/.libs/libapetag.a \ - system/players/paplayer/libmodplug-$(ARCH).so \ xbmc/lib/cmyth/libcmyth/libcmyth.a \ xbmc/lib/cmyth/librefmem/librefmem.a \ xbmc/lib/libRTMP/librtmp.a \ @@ -389,8 +391,8 @@ xcode_depends: \ xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \ xbmc/lib/libshout/libshout-@ARCH@.a \ xbmc/lib/libjsonrpc/libjsonrpc.a \ - lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \ xbmc/lib/libhttpapi/libhttpapi.a \ + lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \ lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a # platform independend objects @@ -478,7 +480,7 @@ endif xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(CXXFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) $(LDFLAGS) -rdynamic + $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic else $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) -Wl,--no-whole-archive $(OBJSXBMC) $(LIBS) -rdynamic endif |