Commit 62ef1556 authored by Sam Hocevar's avatar Sam Hocevar

* ./mozilla/*: moved support files in a separate directory.

  * ./mozilla/support/npmac.cpp: added a hacked version of Mozilla's npmac.cpp
    that builds with g++ instead of CodeWarrior.
parent e0cc8b35
...@@ -612,8 +612,9 @@ SOURCES_mozilla = \ ...@@ -612,8 +612,9 @@ SOURCES_mozilla = \
mozilla/vlcplugin.h \ mozilla/vlcplugin.h \
mozilla/vlcpeer.cpp \ mozilla/vlcpeer.cpp \
mozilla/vlcpeer.h \ mozilla/vlcpeer.h \
mozilla/classinfo.h \ mozilla/support/classinfo.h \
$(SOURCES_mozilla_win32) \ $(SOURCES_mozilla_win32) \
$(SOURCES_mozilla_macosx) \
$(SOURCES_mozilla_unix) \ $(SOURCES_mozilla_unix) \
$(NULL) $(NULL)
...@@ -622,11 +623,16 @@ SOURCES_mozilla = \ ...@@ -622,11 +623,16 @@ SOURCES_mozilla = \
# under Win32 and npunix.c under Unix. # under Win32 and npunix.c under Unix.
if HAVE_WIN32 if HAVE_WIN32
LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT) LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
SOURCES_mozilla_win32 = mozilla/npwin.cpp SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
else else
if HAVE_DARWIN
# We don't define LIBRARIES_mozilla because we'll be using project builder
SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
else
LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT) LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
SOURCES_mozilla_unix = mozilla/npunix.c SOURCES_mozilla_unix = mozilla/support/npunix.c
endif
endif endif
if BUILD_MOZILLA if BUILD_MOZILLA
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlcpeer.h: scriptable peer descriptor * vlcpeer.h: scriptable peer descriptor
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlcpeer.h,v 1.2 2002/09/30 11:05:41 sam Exp $ * $Id: vlcpeer.h,v 1.3 2003/04/09 16:18:36 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
*****************************************************************************/ *****************************************************************************/
#include "vlcintf.h" #include "vlcintf.h"
#include "classinfo.h" #include "support/classinfo.h"
class VlcPlugin; class VlcPlugin;
......
/***************************************************************************** /*****************************************************************************
* vlcshell.c: a VLC plugin for Mozilla * vlcshell.cpp: a VLC plugin for Mozilla
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlcshell.cpp,v 1.10 2003/02/18 13:13:12 sam Exp $ * $Id: vlcshell.cpp,v 1.11 2003/04/09 16:18:36 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment