diff options
| author | wsnipex <wsnipex@a1.net> | 2014-05-11 12:04:07 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2014-12-09 10:52:31 +0100 |
| commit | 898c3231cb8e5267c5d924c6784fcb2c236fa954 (patch) | |
| tree | 4b21e9b4beafd7faf3e04c058eba16a9a0922a65 | |
| parent | abbfacf966d9923d1a97db79f9865120bfc8f91d (diff) | |
[linux] fix building libxbmc.so
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 1d9859a950..f88c88b558 100644 --- a/Makefile.in +++ b/Makefile.in @@ -496,13 +496,11 @@ LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ $(FFMPEGOBJS): dvdpcodecs endif -ifneq (@USE_LIBXBMC@,1) -MAINOBJS+=xbmc/main/main.a -else ifeq (@USE_ANDROID@,1) MAINOBJS+=xbmc/android/activity/activity.a +else +MAINOBJS+=xbmc/main/main.a endif # USE_ANDROID -endif # USE_LIBXBMC OBJSXBMC =$(DIRECTORY_ARCHIVES) @@ -523,7 +521,7 @@ lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) ifeq ($(findstring osx,@ARCH@), osx) $(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -read_only_relocs suppress else - $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(MAINOBJS) -Wl,--no-whole-archive,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) + $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(MAINOBJS) -Wl,--no-whole-archive,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) -Wl,-Bsymbolic endif @APP_NAME_LC@.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) |