Merge pull request #961 from jimfcarroll/thread-cleanup

Adds back signal handling and windows translated exception handling

diff --cc Makefile.in
index db8df12,f12cc57..e535231
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -342,19 -337,12 +344,19 @@@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), 
  
  LIBS += @PYTHON_LDFLAGS@
  
 -xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC)
 +libxbmc.so: $(OBJSXBMC) $(DYNOBJSXBMC)
 +ifeq ($(findstring osx,@ARCH@), osx)
 +      $(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS)
 +else
 +      $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(LIBS)
 +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

diff --cc project/VS2010Express/XBMC.vcxproj
Simple merge

diff --cc project/VS2010Express/XBMC.vcxproj.filters
Simple merge

diff --cc project/VS2010Express/XbmcCommons.vcxproj
Simple merge

diff --cc project/VS2010Express/XbmcThreads.vcxproj
Simple merge

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
Simple merge

diff --cc xbmc/filesystem/Directory.cpp
Simple merge

diff --cc xbmc/utils/Makefile
Simple merge