[vlc-devel] commit: skins2: fallback to x11 os factory for os not win or osx. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Nov 24 17:13:54 2009 +0100| [f16ee6f7f97e2c5ff964e419e715ccf2c684f1bc] | committer: Rémi Duraffort 

skins2: fallback to x11 os factory for os not win or osx.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f16ee6f7f97e2c5ff964e419e715ccf2c684f1bc
---

 configure.ac                  |    1 -
 modules/gui/skins2/Modules.am |   43 +++++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 42dd032..ddea7da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,7 +418,6 @@ AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
 AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
-AM_CONDITIONAL(USE_X11_FOR_SKINS2, [case "${SYS}" in linux*|openbsd*) true;; *) false;; esac])
 
 dnl
 dnl Sadly autoconf doesn't think about testing foo.exe when ask to test
diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index 2142fdd..c64f53c 100644
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -209,9 +209,26 @@ SOURCES_skins2 += \
 	win32/win32_window.cpp \
 	win32/win32_window.hpp \
     $(NULL)
-endif
-
-if USE_X11_FOR_SKINS2
+else if HAVE_DARWIN
+SOURCES_skins2 += \
+	macosx/macosx_dragdrop.cpp \
+	macosx/macosx_dragdrop.hpp \
+	macosx/macosx_factory.cpp \
+	macosx/macosx_factory.hpp \
+	macosx/macosx_graphics.cpp \
+	macosx/macosx_graphics.hpp \
+	macosx/macosx_loop.cpp \
+	macosx/macosx_loop.hpp \
+	macosx/macosx_popup.cpp \
+	macosx/macosx_popup.hpp \
+	macosx/macosx_timer.cpp \
+	macosx/macosx_timer.hpp \
+	macosx/macosx_window.cpp \
+	macosx/macosx_window.hpp \
+	macosx/macosx_tooltip.cpp \
+	macosx/macosx_tooltip.hpp \
+    $(NULL)
+else
 SOURCES_skins2 += \
 	x11/x11_display.cpp \
 	x11/x11_display.hpp \
@@ -234,23 +251,3 @@ SOURCES_skins2 += \
     $(NULL)
 endif
 
-if HAVE_DARWIN
-SOURCES_skins2 += \
-	macosx/macosx_dragdrop.cpp \
-	macosx/macosx_dragdrop.hpp \
-	macosx/macosx_factory.cpp \
-	macosx/macosx_factory.hpp \
-	macosx/macosx_graphics.cpp \
-	macosx/macosx_graphics.hpp \
-	macosx/macosx_loop.cpp \
-	macosx/macosx_loop.hpp \
-	macosx/macosx_popup.cpp \
-	macosx/macosx_popup.hpp \
-	macosx/macosx_timer.cpp \
-	macosx/macosx_timer.hpp \
-	macosx/macosx_window.cpp \
-	macosx/macosx_window.hpp \
-	macosx/macosx_tooltip.cpp \
-	macosx/macosx_tooltip.hpp \
-    $(NULL)
-endif