diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index fd36b547e6..2427d97c12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,10 +93,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ xbmc/windows/windows.a \ xbmc/xbmc.a \ -ifneq (@USE_LIBXBMC@,1) -DIRECTORY_ARCHIVES +=xbmc/main/main.a -endif - NWAOBJSXBMC= xbmc/threads/threads.a \ xbmc/commons/commons.a @@ -456,10 +452,12 @@ BINDINGS+=xbmc/addons/include/xbmc_scr_dll.h BINDINGS+=xbmc/addons/include/xbmc_scr_types.h BINDINGS+=xbmc/addons/include/xbmc_vis_dll.h BINDINGS+=xbmc/addons/include/xbmc_vis_types.h +BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h BINDINGS+=addons/library.xbmc.gui/libXBMC_gui.h BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h +BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h libxbmc.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) ifeq ($(findstring osx,@ARCH@), osx) @@ -468,7 +466,10 @@ else $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MAINOBJS) -Wl,--start-group $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) endif -xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) +xbmc/main/main.a: + $(MAKE) -C xbmc/main + +xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) xbmc/main/main.a ifeq ($(findstring osx,@ARCH@), osx) $(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic |