diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/Makefile.am | 22 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 6 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 09d42fd49..982a93c62 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -6,15 +6,19 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la -if !HAVE_ZLIB INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la -endif -if WIN32 DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la -endif -if !SETENV SETENV_LIB = $(top_builddir)/win32/contrib/libsetenv.la +if !HAVE_ZLIB +zlib_lib = $(INTERNAL_ZLIB_LIB) +endif +if WIN32 +dirent_lib = $(DIRENT_LIB) +pthread_lib = $(INTERNAL_PTHREAD_LIB) +endif +if !HAVE_SETENV +setenv_lib = $(SETENV_LIB) endif libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ @@ -27,12 +31,12 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h -libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(INTERNAL_ZLIB_LIB) \ - $(DIRENT_LIB) $(INTERNAL_PTHREAD_LIB) \ - $(SETENV_LIB) +libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_lib) \ + $(dirent_lib) $(pthread_lib) \ + $(setenv_lib) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ - $(DIRENT_LIB) $(SETENV_LIB) + $(dirent_lib) $(setenv_lib) libxine_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index f72a9107f..b85b1920a 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.184 2004/07/22 14:27:48 mroi Exp $ + * $Id: load_plugins.c,v 1.185 2004/08/28 20:03:42 valtri Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -494,7 +494,7 @@ static void collect_plugins(xine_t *this, char *path){ */ #if defined(__hpux) if(!strstr(str, ".sl")) -#elif defined(__CYGWIN__) +#elif defined(__CYGWIN__) || defined(WIN32) if(!strstr(str, ".dll")) #else if(!strstr(str, ".so")) @@ -1001,7 +1001,7 @@ void _x_scan_plugins (xine_t *this) { load_cached_catalog (this); if ( !(pluginpath = getenv("XINE_PLUGIN_PATH")) ){ -#ifndef _MSC_VER +#ifndef WIN32 pluginpath = "~/.xine/plugins:" XINE_PLUGINDIR; #else pluginpath = XINE_PLUGINDIR; |