summaryrefslogtreecommitdiff
path: root/win32/contrib
diff options
context:
space:
mode:
authorRobin KAY <komadori@users.sourceforge.net>2004-08-30 00:55:18 +0000
committerRobin KAY <komadori@users.sourceforge.net>2004-08-30 00:55:18 +0000
commita5171860bcd55e56bacec9894c31c89d6b683494 (patch)
tree6f94208cb9079acfeee961a2948cec88d1fc58d8 /win32/contrib
parent07be95eb3dc9d3a504df8d78a80c9136fbe2e866 (diff)
downloadxine-lib-a5171860bcd55e56bacec9894c31c89d6b683494.tar.gz
xine-lib-a5171860bcd55e56bacec9894c31c89d6b683494.tar.bz2
Fix the way the library path is supplied when testing for libdga. Disable compilation of win32/contrib/setenv.c on non-Win32 platforms (I don't see why it's necessary at all as we have xine_setenv). Front-ends use symbols in src/xine-utils but these aren't being exported in libxine.so because they come from an internal archive library. Compile xmlparser.c in src/xine-engine/Makefile.am for now (is there a better solution?).
CVS patchset: 6917 CVS date: 2004/08/30 00:55:18
Diffstat (limited to 'win32/contrib')
-rw-r--r--win32/contrib/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am
index 433ea66e6..135485199 100644
--- a/win32/contrib/Makefile.am
+++ b/win32/contrib/Makefile.am
@@ -4,11 +4,10 @@ SUBDIRS = zlib pthreads
noinst_HEADERS = dirent/dirent.h timer/timer.h
+if WIN32
if !HAVE_SETENV
libsetenv = libsetenv.la
endif
-
-if WIN32
win32libs = libtimer.la libdirent.la
endif