Changeset 3e1fea390e453b25f50d1e4308b80a4a962b8564

Timestamp:

05/10/08 10:33:09 (2 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210408389 +0300

git-parent:

[a7f65650ff66ba2733e3e45e3e9b48e7bf5acfb2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210408380 +0300

Message:

Build (linux|not)_specific.c as appropriate

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (5 diffs)
• src/libvlc.h (modified) (2 diffs)

configure.ac

@@ -347 +347 @@
-AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
-AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
+AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
-AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
-AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")

src/Makefile.am

@@ -174 +174 @@
-    -DSYSCONFDIR=\"$(sysconfdir)\" \
-    -DDATA_PATH=\"$(pkgdatadir)\" \
+    -DLIBDIR=\"$(libdir)\" \
-    -DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
@@ -202 +203 @@
-    $(SOURCES_libvlc_beos) \
-    $(SOURCES_libvlc_darwin) \
+    $(SOURCES_libvlc_linux) \
-    $(SOURCES_libvlc_win32) \
+    $(SOURCES_libvlc_other) \
-    $(SOURCES_libvlc_dirent) \
-    $(SOURCES_libvlc_getopt) \
@@ -209 +212 @@
-if HAVE_BEOS
-libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
-ndif
+lse
-if HAVE_DARWIN
-libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
-
+
+
+
+
-if HAVE_WIN32
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-ndif
+lse
-if HAVE_WINCE
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-endif
+endif
+endif
+endif
+endif
-if BUILD_DIRENT
-libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
@@ -235 +245 @@
-SOURCES_libvlc_darwin = \
-    misc/darwin_specific.c \
+    $(NULL)
+
+SOURCES_libvlc_linux = \
+    misc/linux_specific.c \
-    $(NULL)
-
@@ -241 +255 @@
-    network/winsock.c \
-    $(NULL)
+
+SOURCES_libvlc_other = misc/not_specific.c
-
-SOURCES_libvlc_dirent = \

src/libvlc.h

@@ -41 +41 @@
-void system_End       ( libvlc_int_t * );
-
-#if defined( SYS_BEOS )
-/* Nothing at the moment, create beos_specific.h when needed */
-#elif defined( __APPLE__ )
-/* Nothing at the moment, create darwin_specific.h when needed */
-#elif defined( WIN32 ) || defined( UNDER_CE )
-
-#else
-# define system_Init( a, b, c )      (void)0
-# define system_Configure( a, b, c ) (void)0
-# define system_End( a )             (void)0
-#endif
-
-
-/*
- * Threads subsystem
@@ -155 +142 @@
-    module_bank_t *        p_module_bank; ///< The module bank
-
-    /* Arch-specific variables */
-#if defined( SYS_BEOS )
-    char *                 psz_vlcpath;
-#elif defined( __APPLE__ )
-    char *                 psz_vlcpath;
-#elif defined( WIN32 )
-    char *                 psz_vlcpath;
-#endif
-} libvlc_global_data_t;
-