diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2011-09-20 22:06:13 -0400 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2012-04-21 07:54:10 -0400 |
| commit | 440a2a59af5b254ad702662c72349e3239ff61f2 (patch) | |
| tree | 3ce8e9df752252b0b15e340c52e047e4ce298f1d /Makefile.in | |
| parent | 64427d44d61950244b376c8ae8b6dd62c460d7f6 (diff) | |
Broke circular dependency between threads and utils.
This took the following steps:
1) Created a "commons" library with a logger interface ILogger
2) Made CThread dependent on the ILogger interface.
3) Created an ILogger implementation as part of CLog in utils.
4) Set the logger implementation for CThread at the xbmc app level.
5) Project changes for removing circ. deps.
Diffstat (limited to 'Makefile.in')
| -rwxr-xr-x | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 354ec0bc93..e0e571ae89 100755 --- a/Makefile.in +++ b/Makefile.in @@ -30,6 +30,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ lib/xbmc-dll-symbols/dll-symbols.a \ xbmc/addons/addons.a \ xbmc/cdrip/cdrip.a \ + xbmc/commons/commons.a \ xbmc/cores/AudioRenderers/audiorenderers.a \ xbmc/cores/DllLoader/dllloader.a \ xbmc/cores/DllLoader/exports/exports.a \ @@ -306,7 +307,6 @@ xcode_depends: \ lib/libXDAAP/libxdaap.a \ lib/SlingboxLib/SlingboxLib.a - OBJSXBMC =$(DIRECTORY_ARCHIVES) OBJSXBMC+=lib/libapetag/.libs/libapetag.a @@ -325,7 +325,8 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC)) LIBS += @PYTHON_LDFLAGS@ -xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) +xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) + ifeq ($(findstring osx,@ARCH@), osx) $(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic else |