From 91f653b6a9020f96f2e876842cb7a616830023f4 Mon Sep 17 00:00:00 2001 From: Jim Carroll Date: Sat, 12 Feb 2011 09:22:36 -0500 Subject: g_Windowing global is now fixed w.r.t. initialization and deinitialization problems. This variable is different depending on the platform so multiple header files were changed and need to be tested on the respective platforms. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 6d362aef43..fb60047c9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -292,6 +292,8 @@ xbmc/powermanagement/linux/powermanagement_linux.a: force $(MAKE) -C xbmc/powermanagement/linux xbmc/powermanagement/osx/powermanagement.a: force $(MAKE) -C xbmc/powermanagement/osx +xbmc/windowing/X11/windowing_X11.a: force + $(MAKE) -C xbmc/windowing/X11 xbmc/rendering/rendering.a: force $(MAKE) -C xbmc/rendering xbmc/rendering/gl/rendering_gl.a: force @@ -302,8 +304,6 @@ xbmc/windowing/windowing.a: force $(MAKE) -C xbmc/windowing xbmc/windowing/egl/windowing_egl.a: force $(MAKE) -C xbmc/windowing/egl -xbmc/windowing/X11/windowing_X11.a: force - $(MAKE) -C xbmc/windowing/X11 xbmc/windowing/osx/windowing_osx.a: force $(MAKE) -C xbmc/windowing/osx xbmc/storage/storage.a: force @@ -632,7 +632,7 @@ xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) ifeq ($(findstring osx,@ARCH@), osx) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic else - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) -Wl,--no-whole-archive $(OBJSXBMC) $(LIBS) -rdynamic + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin -Wl,--whole-archive $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--no-whole-archive $(LIBS) -rdynamic endif xbmc-xrandr: xbmc-xrandr.c -- cgit v1.2.3