diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-01 18:19:49 +0000 |
| commit | ebdf62cd13f7976890cbf3703571fc55a20df47e (patch) | |
| tree | 2ce7eea59f7ff5173e2c91f550d86b9cfe2f392a /win32/contrib | |
| parent | 8c04de48fdd50d279f1b7d93f184006ca1db056a (diff) | |
| download | xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.gz xine-lib-ebdf62cd13f7976890cbf3703571fc55a20df47e.tar.bz2 | |
Improvements and implementing Michael's suggestions:
- new flags added at the end, so the users can override them properly
- removed X11 libs and cflags from xine-config and libxine.pc
- removed replacing for setenv (thanks to Robin for the hint)
- better way for temporary disabling of w32dll module
- data directories will be different on Windows
- force installing catalogs with translation into XINE_LOCALEDIR
- timer linked in xine-engine (just central place for linking such stuff)
- adjusted load_plugins and remove reduntant WIN32 conditionals
- removed unused $(lib_thr)
CVS patchset: 6927
CVS date: 2004/09/01 18:19:49
Diffstat (limited to 'win32/contrib')
| -rw-r--r-- | win32/contrib/Makefile.am | 7 | ||||
| -rw-r--r-- | win32/contrib/pthreads/Makefile.am | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am index 135485199..ce9fd2d17 100644 --- a/win32/contrib/Makefile.am +++ b/win32/contrib/Makefile.am @@ -5,15 +5,10 @@ SUBDIRS = zlib pthreads noinst_HEADERS = dirent/dirent.h timer/timer.h if WIN32 -if !HAVE_SETENV -libsetenv = libsetenv.la -endif win32libs = libtimer.la libdirent.la endif -noinst_LTLIBRARIES = $(libsetenv) $(win32libs) - -libsetenv_la_SOURCES = setenv.c +noinst_LTLIBRARIES = $(win32libs) libtimer_la_SOURCES = timer/timer.c diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am index dc55b0107..a8dfb0cb2 100644 --- a/win32/contrib/pthreads/Makefile.am +++ b/win32/contrib/pthreads/Makefile.am @@ -1,7 +1,6 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -#AM_CLFAGS = -I. -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C -AM_CPPFLAGS = -D__CLEANUP_C +AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTIRS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw |