Changeset eddf123620abac25909f3e7b669f5ed34cd62405

Timestamp:

10/06/02 21:28:28 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1033932508 +0000

git-parent:

[81478e4fe6efc9d12b664e0646ec793e23499671]

git-author:

Gildas Bazin <gbazin@videolan.org> 1033932508 +0000

Message:

* configure.ac.in: vlc can now be built under cygwin with or without the

unix emulation layer (without if you use CC="gcc -mno-cygwin").

* INSTALL.win32: doc update for cygwin build.
* modules/video_output/directx/events.c, modules/video_output/directx/directx.c,

modules/audio_output/directx.c: compilation fixes for cygwin.

Files:

• INSTALL.win32 (modified) (7 diffs)
• configure.ac.in (modified) (3 diffs)
• modules/audio_output/directx.c (modified) (2 diffs)
• modules/video_output/directx/directx.c (modified) (2 diffs)
• modules/video_output/directx/events.c (modified) (3 diffs)

INSTALL.win32

@@ -24 +24 @@
-
-If you want to do the tricky job of building vlc from sources, you can do it
-two
+several
-
-- natively on Windows, using MSYS+MINGW (www.mingw.org)
-  (MSYS is a minimal build environnement to compile unixish projects under
-   windoze. It provides all the common unix tools like sh, gmake...)
+
+- natively on Windows, using cygwin (www.cygwin.com) with or without the
+  unix emulation layer.
-
-- or on Linux, using the mingw32 cross-compiler
@@ -45 +48 @@
-to build the DirectX, GTK and SDL plugins.
-
-
+ with MSYS+MINGW
-You will need to download and install the latest MSYS (version 1.0.7 as
-of now) and MINGW.
@@ -70 +73 @@
-archive in a different directory.
-
+- compiling natively on Windoze with cygwin:
+You will need to download and install cygwin (www.cygwin.com).
+
+You must also not forget to install the extra development packages if you want
+to build the DirectX, GTK and SDL plugins.
+(http://www.videolan.org/vlc/windows.html)
+
-Configuring the build
-=====================
@@ -81 +91 @@
-along those lines:
-
-make distclean 
+./bootstrap
-  CC=i586-mingw32msvc-gcc \
-  ./configure --host=i586-mingw32msvc --build=i386-linux \
@@ -92 +102 @@
-www.videolan.org, you have to use something along those lines:
-
+  ./bootstrap; \
-  CC=i586-mingw32msvc-gcc \
-  PATH=/usr/local/cross-tools/bin:$PATH \
@@ -102 +113 @@
-If you are compiling natively on Windoze, then you can use something
-along those lines:
+  ./bootstrap; \
-  ./configure \
-  --with-gtk-config-path=/c/dev/gtk-win32/bin \
@@ -107 +119 @@
-  --with-directx=/c/dev/dxheaders \
-  --with-dvdcss-tree=../libdvdcss-win
+
+If you are using cygwin, you can build vlc with or without the unix emulation
+layer (without is usually better). To build without the emulaion layer, use
+something like this:
+  ./bootstrap; \
+  CC="gcc -mno-cygwin" \
+  ./configure \
+  --with-gtk-config-path=/cygdrive/c/dev/gtk-win32/bin \
+  --with-sdl-config-path=/cygdrive/c/dev/SDL-1.2.3-win32/i386-mingw32msvc/bin \
+  --with-directx=/cygdrive/c/dev/dxheaders \
+  --with-dvdcss-tree=../libdvdcss-win
+If you want to use the emulation layer, then just omit the CC="gcc -mno-cygwin"
+line.
-
-Note: when using the --with-dvdcss-tree you need to compile the tree

configure.ac.in

@@ -96 +96 @@
-    LIBEXT=".dylib"
-    ;;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    AC_CHECK_TOOL(WINDRES, windres, :)
-    LIBEXT=".dll"
+
+    case "x${target_os}" in
+      x*mingw32*)
+        SYS=mingw32
+        ;;
+      x*cygwin*)
+        dnl Check if we are using the mno-cygwin mode in which case we are
+        dnl actually dealing with a mingw32 compiler.
+        AC_EGREP_CPP(yes,
+            [#ifdef WIN32
+             yes
+             #endif],
+            SYS=mingw32, SYS=cygwin)
+        ;;
+    esac
+
+    if test "x$SYS" = "xmingw32"; then
+        CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
+        CPPFLAGS="${CPPFLAGS_save}"
+        LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
+        LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
+        LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
+        LDFLAGS_access_http="${LDFLAGS_http} -lws2_32"
+        LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
+    fi
-    ;;
-  x*nto*)
@@ -1484 +1497 @@
-if test "x${enable_directx}" != "xno"
-then
-
+ -o "x${SYS}" = "xcygwin"
-  then
-    AC_ARG_WITH(directx,
@@ -1668 +1681 @@
-AC_ARG_ENABLE(waveout,
-  [  --enable-waveout        Win32 waveOut module (default enabled on Win32)])
- -a "x${SYS}" = "xmingw32"
-
+; then
+if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; 
-    PLUGINS="${PLUGINS} waveout"
-    LDFLAGS_waveout="-lwinmm"
+  fi
-fi
-

modules/audio_output/directx.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/10/05 17:29:50
+2 2002/10/06 19:28:28
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -35 +35 @@
-#include "aout_internal.h"
-
+#include <windows.h>
-#include <mmsystem.h>
-#include <dsound.h>

modules/video_output/directx/directx.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/10/05 17:29:50
+3 2002/10/06 19:28:28
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -43 +43 @@
-#include <vlc/vout.h>
-
+#include <windows.h>
-#include <ddraw.h>
-

modules/video_output/directx/events.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/10/01 20:43:35 ipkiss
+3 2002/10/06 19:28:28 gbazin
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -247 +247 @@
-    HMENU      hMenu;
-    HICON      vlc_icon = NULL;
-_
+
-
-    msg_Dbg( p_vout, "DirectXCreateWindow" );
@@ -291 +291 @@
-    /* Get the Icon from the main app */
-    vlc_icon = NULL;
-_
+
-    {
-        vlc_icon = ExtractIcon( hInstance, vlc_path, 0 );