summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README.MINGWCROSS11
-rw-r--r--doc/README.WIN321
-rw-r--r--doc/hackersguide/output.sgml2
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/README.MINGWCROSS b/doc/README.MINGWCROSS
index a840172a6..c867bf9ac 100644
--- a/doc/README.MINGWCROSS
+++ b/doc/README.MINGWCROSS
@@ -173,6 +173,9 @@ In following text are used symbols $PREFIX and $USER with this meaning:
#
mv pthread.def pthreadGC2.def
wine LIB.EXE /machine:i386 /def:pthreadGC2.def
+ #
+ # installing
+ #
su
mkdir -p $PREFIX/pthreads-win32/bin
mkdir -p $PREFIX/pthreads-win32/include
@@ -193,12 +196,18 @@ In following text are used symbols $PREFIX and $USER with this meaning:
# small workaround in Makefile:
#
sed -e 's/dllwrap /i386-mingw32-dllwrap /g' win32/Makefile.gcc > Makefile
+ #
+ # compiling
+ #
make CC=i386-mingw32-gcc AR=i386-mingw32-ar RC=i386-mingw32-windres STATICLIB=libz-static.a IMPLIB=libz.a
#
# possibility to use zlib library in M$ Visual C (optional)
#
cp win32/zlib.def zlib1.def
wine LIB.EXE /machine:i386 /def:zlib1.def
+ #
+ # installing
+ #
su
mkdir -p $PREFIX/zlib/{include,lib,bin}
cp zconf.h zlib.h $PREFIX/zlib/include/
@@ -247,7 +256,7 @@ Now we can build xine library for Windows by this way:
# if we want to use xine library in M$ compilers, we will need wine and some
# tools from M$ Visual C: LIB.EXE, LINK.EXE, MSPDB60.DLL
#
- # create libxine-1.lib file
+ # create libxine-1.lib file (optional)
#
cd <path_where_libxine_is_installed_>/lib
cp ../bin/libxine-1.dll .
diff --git a/doc/README.WIN32 b/doc/README.WIN32
index bff456ce7..6c19553d8 100644
--- a/doc/README.WIN32
+++ b/doc/README.WIN32
@@ -170,4 +170,3 @@ Bugs:
- random crashes and random locks in stress tests
- non-seekable input plugins crash
- ffmpeg bug visible for some video sizes
- - pause doesn't work (asserts)
diff --git a/doc/hackersguide/output.sgml b/doc/hackersguide/output.sgml
index d24e8f903..806e89d0a 100644
--- a/doc/hackersguide/output.sgml
+++ b/doc/hackersguide/output.sgml
@@ -357,7 +357,7 @@
Rewiring is the reconnection of one post plugin's outputs and another post plugin's
inputs. This can happen on the fly during playback, which makes this a very delicate
process. In one such input to output connection, only the output is active by either
- writing data directly to the connected intput or by calling functions there. Therefore
+ writing data directly to the connected input or by calling functions there. Therefore
we have to notify only the output, when it is rewired. This is done by calling the
<function>rewire()</function> member function of the corresponding
<type>xine_post_out_t</type> when the frontend issues a rewiring on this output.