Commit 5c892aa9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

NPAPI: Move fullscreen code to common/

parent 81782c7d
......@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = \
dist-xz \
no-dist-gzip
DIST_SUBDIRS= share npapi activex
DIST_SUBDIRS= share npapi activex common
SUBDIRS = npapi
if BUILD_ACTIVEX
SUBDIRS += activex
......
......@@ -27,7 +27,7 @@
#include <vlc/vlc.h>
#include "vlc_win32_fullscreen.h"
#include "win32_fullscreen.h"
/////////////////////////////////
//VLCHolderWnd static members
......
......@@ -158,6 +158,8 @@ dnl pkg-config
dnl As we want to do a loop due to the number of name possible for the .pc
dnl we can't use the pkg-config macros.
CPPFLAGS="${CPPFLAGS} -Icommon"
AC_MSG_NOTICE([Checking for Mozilla])
AS_IF([test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"], [
found=0
......
......@@ -62,8 +62,8 @@ lib_LTLIBRARIES = npvlc.la
AM_CPPFLAGS += -DXP_WIN -DXP_WIN32 \
-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
SOURCES_support = support/npwin.cpp \
vlc_win32_fullscreen.cpp \
vlc_win32_fullscreen.h
../common/win32_fullscreen.cpp \
../common/win32_fullscreen.h
npvlc_la_DEPENDENCIES += $(DATA_npvlc_rc)
npvlc_la_LDFLAGS += -Wl,--kill-at -Wl,$(DATA_npvlc_rc)
......
......@@ -63,7 +63,7 @@
#endif
#ifdef XP_WIN
#include "vlc_win32_fullscreen.h"
#include "../common/win32_fullscreen.h"
static HMODULE hDllModule= 0;
......
......@@ -184,7 +184,7 @@ private:
#ifdef XP_WIN
HMODULE DllGetModule();
#include "vlc_win32_fullscreen.h"
#include "../common/win32_fullscreen.h"
#endif
class VlcPlugin
......
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