diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2013-06-16 10:02:51 +0800 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2013-06-17 08:57:47 +0800 |
| commit | 7e8e1c9493a51e4739a507d6f62dadb7db411f78 (patch) | |
| tree | 50c22ee5f8426f0472364fdd21029a851edb9ade /Makefile.in | |
| parent | 3c85e97d7b51fb88ae6f261a92c2ad8e851563c8 (diff) | |
Don't add xbmc.a to DIRECTORY_ARCHIVES
It gets added to MAINOBJS anyways, and adding it to DIRECTORY_ARCHIVES
would mean that it also gets added to the tests, which would result
in a double-definition of main () (one from xbmc and one from gtest).
Instead, add it to xbmc.bin directly, as Darwin based platforms require
such static linking.
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 f64ec4fe46..eab8152119 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,10 +92,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 @@ -462,7 +458,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 |