diff options
| author | S. Davilla <davilla@4pi.com> | 2011-03-08 16:05:24 -0500 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-03-08 16:05:24 -0500 |
| commit | f59d0699f8f784632cf18e3baa66e6d4b92782dd (patch) | |
| tree | 431b0c4a96249d6d9877cc3540041688fc0dab42 /Makefile.in | |
| parent | 9793cbe32ead03ffb55c5489107adb3770f1b2aa (diff) | |
[ios] prep. add arm to apple defines where needed, fix makefile.in to understand xxx-arm
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index 23b2fa4942..d6f1ee324c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,11 +205,14 @@ configure: configure.in @./bootstrap # skin textures +ifneq ($(findstring arm,@ARCH@), arm) skins: tools/TexturePacker/TexturePacker force -ifneq (arm, @ARCH@) $(MAKE) -C $(CONFLUENCE_MEDIA) +else +skins: endif + xbmc/guilib/guilib.a: force $(MAKE) -C xbmc/guilib lib/tinyXML/tinyxml.a: force @@ -381,9 +384,13 @@ lib/cpluff/libcpluff/.libs/libcpluff.a: force system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a ifeq ($(findstring osx,@ARCH@), osx) ifeq (@ARCH@, powerpc-osx) - ld -all_load -bundle -flat_namespace -undefined suppress -arch @ARCHTYPE@ -L/opt/local/lib -lexpat -lbundle1.o -o $@ $< - else - ld -all_load -bundle -flat_namespace -undefined suppress -arch @ARCHTYPE@ -L/opt/local/lib -lexpat -o $@ $< + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat -lbundle1.o -o $@ $< + endif + ifeq (@ARCH@, x86-osx) + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat -o $@ $< + endif + ifeq (@ARCH@, arm-osx) + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $< endif else cp lib/cpluff/libcpluff/.libs/libcpluff.so $@ @@ -392,9 +399,13 @@ lib/libmodplug/src/.libs/libmodplug.a: force $(MAKE) -C lib/libmodplug system/players/paplayer/libmodplug-@ARCH@.so: lib/libmodplug/src/.libs/libmodplug.a ifeq (@ARCH@, powerpc-osx) - ld -all_load -bundle -flat_namespace -undefined suppress -arch @ARCHTYPE@ -lbundle1.o -o $@ $< -else - ld -all_load -bundle -flat_namespace -undefined suppress -arch @ARCHTYPE@ -o $@ $< + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lbundle1.o -o $@ $< +endif +ifeq (@ARCH@, x86-osx) + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -o $@ $< +endif +ifeq (@ARCH@, arm-osx) + $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $< endif lib/xbmc-dll-symbols/dll-symbols.a: force $(MAKE) -C lib/xbmc-dll-symbols @@ -408,7 +419,7 @@ exports: dllloader: exports $(MAKE) xbmc/cores/DllLoader/dllloader.a visualizations: exports -ifneq (arm, @ARCH@) +ifneq ($(findstring arm,@ARCH@), arm) $(MAKE) -C xbmc/visualizations/OpenGLSpectrum $(MAKE) -C xbmc/visualizations/WaveForm $(MAKE) -C xbmc/visualizations/XBMCProjectM @@ -422,7 +433,7 @@ endif endif endif screensavers: exports -ifneq (arm, @ARCH@) +ifneq ($(findstring arm,@ARCH@), arm) $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc endif libpython: dllloader @@ -438,7 +449,9 @@ ifneq (@USE_EXTERNAL_LIBASS@,1) endif eventclients: ifeq ($(findstring osx,@ARCH@), osx) +ifneq ($(findstring arm,@ARCH@), arm) $(MAKE) -C tools/EventClients/Clients/OSXRemote +endif else $(MAKE) -C tools/EventClients endif @@ -456,7 +469,9 @@ endif $(MAKE) -C lib/vgmstream $(MAKE) -C lib/timidity $(MAKE) -C lib/nosefart +ifneq ($(findstring arm-osx,@ARCH@), arm-osx) $(MAKE) -C lib/libsidplay2 +endif ifeq (@USE_ASAP_CODEC@,1) ifneq ($(findstring osx,@ARCH@), osx) $(MAKE) -C lib/asap asap-xbmc @@ -566,7 +581,7 @@ OBJSXBMC+= \ lib/UnrarXLib/UnrarXLib.a endif -ifneq (arm, @ARCH@) +ifneq ($(findstring arm,@ARCH@), arm) # Can't include libhts for arm due to GPLv3 OBJSXBMC+= \ lib/libhts/libhts.a @@ -577,8 +592,6 @@ ifeq ($(findstring osx,@ARCH@), osx) OBJSXBMC += \ xbmc/osx/osx.a \ xbmc/windowing/osx/windowing_osx.a \ - lib/darwin/libSDL-OSX/libSDL-@ARCH@.a \ - lib/darwin/libSDL-OSX/libSDL_mixer-@ARCH@.a \ lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a \ xbmc/threads/darwin/threads_darwin.a \ xbmc/powermanagement/osx/powermanagement.a \ @@ -612,7 +625,7 @@ DYNOBJSXBMC= \ xbmc/video/video.a \ xbmc/guilib/guilib.a # must be dynamic to avoid linker errors -ifeq (arm, @ARCH@) +ifeq ($(findstring arm,@ARCH@), arm) # Force external python2.6 for now! LIBS +=-lpython2.6 endif |