diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2012-06-10 05:41:52 -0700 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2012-06-10 05:41:52 -0700 |
| commit | afe842229af346f0dac11692250986843d1f32a6 (patch) | |
| tree | aeab9bab450c42bce11991ea0f860ce5895479ae /Makefile.in | |
| parent | e539456d7801b5d4afaff647dbf09b670da05cf5 (diff) | |
| parent | cf3383acaee5381627dca140480ec53cee1084b2 (diff) | |
Merge pull request #961 from jimfcarroll/thread-cleanup
Adds back signal handling and windows translated exception handling
Diffstat (limited to 'Makefile.in')
| -rwxr-xr-x | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index db8df12781..e535231e5e 100755 --- a/Makefile.in +++ b/Makefile.in @@ -29,7 +29,6 @@ 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/AudioEngine/audioengine.a \ xbmc/cores/DllLoader/dllloader.a \ xbmc/cores/DllLoader/exports/exports.a \ @@ -74,7 +73,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ xbmc/rendering/rendering.a \ xbmc/settings/settings.a \ xbmc/storage/storage.a \ - xbmc/threads/threads.a \ xbmc/utils/utils.a \ xbmc/video/dialogs/videodialogs.a \ xbmc/video/video.a \ @@ -84,6 +82,10 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ xbmc/xbmc.a \ +NWAOBJSXBMC= xbmc/commons/commons.a \ + xbmc/threads/threads.a \ + + ifeq (@USE_WEB_SERVER@,1) DIRECTORY_ARCHIVES += xbmc/network/httprequesthandler/httprequesthandlers.a endif @@ -352,9 +354,9 @@ endif xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) ifeq ($(findstring osx,@ARCH@), osx) - $(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic + $(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic else - $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(LIBS) -rdynamic + $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(NWAOBJSXBMC) $(LIBS) -rdynamic endif xbmc-xrandr: xbmc-xrandr.c |