diff options
| author | FernetMenta <fernetmenta@online.de> | 2012-05-02 12:44:32 +0200 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2012-05-12 11:08:52 -0400 |
| commit | cf3383acaee5381627dca140480ec53cee1084b2 (patch) | |
| tree | 9ad8d88a310a918a9b4c9b64f8119aae0e469874 /Makefile.in | |
| parent | 22980d8e8df2fb727d05f3e22c825a6747b7e387 (diff) | |
Adds back signal handling and windows translated exception handling in a less platform specific manner while preserving the library dependency hierarchy.
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 4500b2c7a5..f12cc57be3 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 @@ -338,9 +340,9 @@ LIBS += @PYTHON_LDFLAGS@ 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 + $(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 |