npapi-vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Nov 8 02:32:44 2011 +0100| [5c892aa907ded1be63c110760cb36a6af22ba5fe] | committer: Jean-Baptiste Kempf
NPAPI: Move fullscreen code to common/ > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=5c892aa907ded1be63c110760cb36a6af22ba5fe --- Makefile.am | 2 +- .../win32_fullscreen.cpp | 2 +- .../win32_fullscreen.h | 0 configure.ac | 2 ++ npapi/Makefile.am | 4 ++-- npapi/vlcplugin.cpp | 2 +- npapi/vlcplugin.h | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index ffea247..a25986f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/npapi/vlc_win32_fullscreen.cpp b/common/win32_fullscreen.cpp similarity index 99% rename from npapi/vlc_win32_fullscreen.cpp rename to common/win32_fullscreen.cpp index abad74b..a9ca2c3 100644 --- a/npapi/vlc_win32_fullscreen.cpp +++ b/common/win32_fullscreen.cpp @@ -27,7 +27,7 @@ #include <vlc/vlc.h> -#include "vlc_win32_fullscreen.h" +#include "win32_fullscreen.h" ///////////////////////////////// //VLCHolderWnd static members diff --git a/npapi/vlc_win32_fullscreen.h b/common/win32_fullscreen.h similarity index 100% rename from npapi/vlc_win32_fullscreen.h rename to common/win32_fullscreen.h diff --git a/configure.ac b/configure.ac index be1ce9b..15219af 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/npapi/Makefile.am b/npapi/Makefile.am index 5f7b516..5aeddc7 100644 --- a/npapi/Makefile.am +++ b/npapi/Makefile.am @@ -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) diff --git a/npapi/vlcplugin.cpp b/npapi/vlcplugin.cpp index 29f0c5e..72c4b37 100644 --- a/npapi/vlcplugin.cpp +++ b/npapi/vlcplugin.cpp @@ -63,7 +63,7 @@ #endif #ifdef XP_WIN -#include "vlc_win32_fullscreen.h" +#include "../common/win32_fullscreen.h" static HMODULE hDllModule= 0; diff --git a/npapi/vlcplugin.h b/npapi/vlcplugin.h index f4036de..8b4a566 100644 --- a/npapi/vlcplugin.h +++ b/npapi/vlcplugin.h @@ -184,7 +184,7 @@ private: #ifdef XP_WIN HMODULE DllGetModule(); -#include "vlc_win32_fullscreen.h" +#include "../common/win32_fullscreen.h" #endif class VlcPlugin _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
