diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-08-01 10:20:33 -0700 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-08-01 10:20:33 -0700 |
| commit | 93fd6efb02ba24367cd4e39227976581214ab819 (patch) | |
| tree | 4b4db074756a9899dd0526d264e55923538453c3 /Makefile.in | |
| parent | f240d90573c885b042b4bc10f2032e605df284d7 (diff) | |
| parent | e4a02782bcd83a9bdf8676379e794e91302b1c8a (diff) | |
Merge pull request #2885 from smspillaz/fix-tests-16062013
Fix "make check"
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index d6f593acb0..41851129cd 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 @@ -470,7 +466,7 @@ 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.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 |