diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:17:33 +0100 |
| commit | 813c609ea30c3201eec34d4bba185566ad48c998 (patch) | |
| tree | f93ff7fd2604bf9396d5f1712d3eaa2f6d044178 /win32 | |
| parent | e728b8f587ee41ff483e46fe50a4cb538c5df9e2 (diff) | |
| parent | a1508e2f58d2c4b32d032d798f6f137262717e7f (diff) | |
| download | xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.gz xine-lib-813c609ea30c3201eec34d4bba185566ad48c998.tar.bz2 | |
Merge from 1.2 tip.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.am | 13 | ||||
| -rw-r--r-- | win32/include/Makefile.am | 14 |
2 files changed, 11 insertions, 16 deletions
diff --git a/win32/Makefile.am b/win32/Makefile.am index 934ddb81a..6f8795b5c 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,10 +1,19 @@ include $(top_srcdir)/misc/Makefile.common -SUBDIRS = include - EXTRA_DIST = \ scripts/post_install.bat \ scripts/ffmpeg_win32.patch \ + include/msvc/sys/time.h \ + include/msvc/config.h \ + include/msvc/inttypes.h \ + include/msvc/stdint.h \ + include/msvc/unistd.h \ + include/sys/socket.h \ + include/netinet/in.h \ + include/sys/socket.h \ + include/dlfcn.h \ + include/netdb.h \ + include/pwd.h \ config.h \ README \ libdvdnav.def \ diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am deleted file mode 100644 index e7f124586..000000000 --- a/win32/include/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -EXTRA_DIST = \ - msvc/sys/time.h \ - msvc/config.h \ - msvc/inttypes.h \ - msvc/stdint.h \ - msvc/unistd.h \ - sys/socket.h \ - netinet/in.h \ - sys/socket.h \ - dlfcn.h \ - netdb.h \ - pwd.h |