diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
| commit | 69a1b10dd38c06f34747e7a55d62fdfcec2883cc (patch) | |
| tree | e10fd932e747549b9c88d3af4fa0dd81a8eb17e1 /misc | |
| parent | b8578b7dfbada9cb57940bfec5b844ea0e871970 (diff) | |
| download | xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.gz xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.bz2 | |
*BUGFIX*
Build improvements and WIN32 port updates:
- add --with-pthread-pefix and --with-zlib-pefix options
- prepare for removing internal zlib and pthreads-win32 relics,
updated documentation for possible WIN32 developers (only for me? :->)
- fixed bug in unimportant part of configure.ac for MinGW due to xine paths
- fixed my bug in cdda (but it compiled fine anyway)
- fixed unimportant bug in planar Makefile.am
- next MSVC update due to external zlib, pthreads and latest changes,
removed relic includes
- checked distcheck
CVS patchset: 7719
CVS date: 2005/09/05 17:02:56
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libxine.pc.in | 4 | ||||
| -rw-r--r-- | misc/xine-config.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index 4ea6f4e61..ea21d74a3 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -7,5 +7,5 @@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ Requires: -Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ @RT_LIBS@ -Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ +Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ +Cflags: -I${includedir} @THREAD_CPPFLAGS@ diff --git a/misc/xine-config.in b/misc/xine-config.in index 4cdd4277c..e21bed104 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,11 +100,11 @@ if test "$echo_acflags" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ @THREAD_CFLAGS_CONFIG@ + echo -I@includedir@ @THREAD_CPPFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ @RT_LIBS@ + echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" |