From fbf4c8060d35617e39b50ae739307152d02ed951 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Sun, 3 Dec 2006 13:48:21 +0000 Subject: [PATCH] A bit of vlc/libvlc cleanup: * libvlc sources and plugins now define __LIBVLC__ and headers exported to plugins (ie, include/vlc_*.h) check for this * libvlc sources use the value of the "libvlc" component in vlc-config instead of vlc * Apply flags directly to "libvlc" in configure.ac - might temporarily break win32 :) --- bindings/python/vlc_module.c | 3 +- bindings/python/vlc_object.c | 6 ++- configure.ac | 82 +++++++++++++++---------------- evc/plugins.vcp.in | 32 ++++++------ include/iso_lang.h | 4 ++ include/main.h | 4 ++ include/vlc/vlc.h | 6 +-- include/vlc_access.h | 4 ++ include/vlc_acl.h | 4 ++ include/vlc_aout.h | 5 ++ include/vlc_arrays.h | 4 ++ include/vlc_bits.h | 4 ++ include/vlc_block.h | 4 ++ include/vlc_block_helper.h | 4 ++ include/vlc_charset.h | 4 ++ include/vlc_codec.h | 5 ++ include/vlc_codecs.h | 4 ++ include/vlc_config.h | 4 ++ include/vlc_config_cat.h | 4 ++ include/vlc_configuration.h | 4 ++ include/vlc_demux.h | 4 ++ include/vlc_devices.h | 5 ++ include/vlc_es.h | 4 ++ include/vlc_es_out.h | 4 ++ include/vlc_filter.h | 5 ++ include/vlc_httpd.h | 4 ++ include/vlc_image.h | 4 ++ include/vlc_input.h | 4 ++ include/vlc_interface.h | 4 ++ include/vlc_intf_strings.h | 4 ++ include/vlc_keys.h | 4 ++ include/vlc_md5.h | 4 ++ include/vlc_messages.h | 9 ++++ include/vlc_meta.h | 4 ++ include/vlc_modules.h | 4 ++ include/vlc_modules_macros.h | 4 ++ include/vlc_mtime.h | 7 ++- include/vlc_network.h | 6 ++- include/vlc_objects.h | 4 ++ include/vlc_os_specific.h | 4 ++ include/vlc_osd.h | 4 ++ include/vlc_playlist.h | 4 ++ include/vlc_sout.h | 4 ++ include/vlc_stream.h | 4 ++ include/vlc_streaming.h | 4 ++ include/vlc_strings.h | 4 ++ include/vlc_threads.h | 4 ++ include/vlc_threads_funcs.h | 4 ++ include/vlc_tls.h | 4 ++ include/vlc_update.h | 4 ++ include/vlc_url.h | 4 ++ include/vlc_variables.h | 4 ++ include/vlc_vlm.h | 4 ++ include/vlc_vod.h | 4 ++ include/vlc_vout.h | 5 ++ include/vlc_vout_synchro.h | 4 ++ include/vlc_xml.h | 4 ++ modules/demux/mp4/drms.c | 8 +-- msvc/libvlc.vcproj.in | 4 +- msvc/plugins.vcproj.in | 4 +- src/Makefile.am | 18 +++---- src/playlist/services_discovery.c | 2 +- test/setup.py | 2 +- toolbox | 8 +-- vlc-config.in.in | 8 +-- 65 files changed, 314 insertions(+), 92 deletions(-) diff --git a/bindings/python/vlc_module.c b/bindings/python/vlc_module.c index ba2fd32c50..94fba63455 100644 --- a/bindings/python/vlc_module.c +++ b/bindings/python/vlc_module.c @@ -22,7 +22,8 @@ *****************************************************************************/ /* We need to access some internal features of VLC (for vlc_object) */ -#define __VLC__ +/* This is gruik as we are not libvlc at all */ +#define __LIBVLC__ #include "vlcglue.h" diff --git a/bindings/python/vlc_object.c b/bindings/python/vlc_object.c index c530a50f3b..95e855ad96 100644 --- a/bindings/python/vlc_object.c +++ b/bindings/python/vlc_object.c @@ -22,7 +22,11 @@ *****************************************************************************/ /* We need to access some internal features of VLC */ -#define __VLC__ +/* Gruik ! */ +#define __LIBVLC__ + +/* Even gruiker ! We access variable_t ! */ +#include "../../src/misc/variables.h" #include "vlcglue.h" diff --git a/configure.ac b/configure.ac index 8fe52bb91d..6ec7ef6eec 100644 --- a/configure.ac +++ b/configure.ac @@ -171,11 +171,10 @@ case "${host_os}" in CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" - VLC_ADD_LDFLAGS([vlc ffmpeg ffmpegaltivec],[-all_load]) + VLC_ADD_LDFLAGS([libvlc ffmpeg ffmpegaltivec],[-all_load]) VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) - VLC_ADD_CFLAGS([libvlc],[-x objective-c]) - VLC_ADD_CFLAGS([vlc],[-x objective-c]) - VLC_ADD_LDFLAGS([vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) + VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) + VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) ;; darwin*) SYS=darwin @@ -184,8 +183,7 @@ case "${host_os}" in OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) - VLC_ADD_CFLAGS([libvlc],[-x objective-c]) - VLC_ADD_CFLAGS([vlc],[-x objective-c]) + VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) @@ -212,15 +210,15 @@ case "${host_os}" in if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) + VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm]) VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync growl],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_CPPFLAGS([vlc],[-Dmain(a,b)=maince(a,b)]) - VLC_ADD_LDFLAGS([vlc],[-lws2 -e WinMainCRTStartup]) + VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)]) + VLC_ADD_LDFLAGS([libvlc vlc],[-lws2 -e WinMainCRTStartup]) VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2]) fi ;; @@ -242,7 +240,7 @@ case "${host_os}" in CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" VLC_ADD_CXXFLAGS([beos],[]) - VLC_ADD_LDFLAGS([vlc logger],[-lbe]) + VLC_ADD_LDFLAGS([vlc libvlc logger],[-lbe]) VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl]) VLC_ADD_LDFLAGS([access_file],[-lpoll]) @@ -315,9 +313,9 @@ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ ]) ], [ AS_IF([test "${enable_libtool}" != "no"], [ - VLC_ADD_LDFLAGS([vlc], [${LTLIBINTL}]) + VLC_ADD_LDFLAGS([libvlc], [${LTLIBINTL}]) ], [ - VLC_ADD_LDFLAGS([vlc], [${LIBINTL}]) + VLC_ADD_LDFLAGS([libvlc], [${LIBINTL}]) ]) ]) AC_SUBST(INCLUDED_LIBINTL) @@ -330,19 +328,19 @@ if test "${SYS}" != "mingwce"; then AS_IF([test "$am_cv_func_iconv" != "yes"], [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) fi -VLC_ADD_CFLAGS([vlc],[${INCICONV}]) +VLC_ADD_CFLAGS([libvlc],[${INCICONV}]) AS_IF([test "${enable_libtool}" != "no"], [ - VLC_ADD_LDFLAGS([vlc],[${LIBICONV}]) + VLC_ADD_LDFLAGS([libvlc],[${LIBICONV}]) ],[ - VLC_ADD_LDFLAGS([vlc],[${LTLIBICONV}]) + VLC_ADD_LDFLAGS([libvlc],[${LTLIBICONV}]) ]) dnl Check for the need to include the mingwex lib for mingw32 if test "${SYS}" = "mingw32" then AC_CHECK_LIB(mingwex,opendir, - AC_CHECK_LIB(mingw32,opendir,VLC_ADD_LDFLAGS([vlc],[]), - [VLC_ADD_LDFLAGS([vlc gtk],[-lmingwex])]) + AC_CHECK_LIB(mingw32,opendir,VLC_ADD_LDFLAGS([libvlc],[]), + [VLC_ADD_LDFLAGS([libvlc gtk],[-lmingwex])]) ) fi @@ -444,7 +442,7 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LDFLAGS([vlc cdda cddax],-lsocket) + VLC_ADD_LDFLAGS([libvlc cdda cddax],-lsocket) LIBS_socket="-lsocket" ]) ]) @@ -457,7 +455,7 @@ AC_CHECK_FUNCS(send,,[ AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - VLC_ADD_LDFLAGS([cdda cddax vlc],[-lnsl]) + VLC_ADD_LDFLAGS([cdda cddax libvlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ VLC_ADD_LDFLAGS([access_mms],[-lbind]) @@ -545,7 +543,7 @@ fi AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ - VLC_ADD_LDFLAGS([vlc],[-lresolv]) + VLC_ADD_LDFLAGS([libvlc],[-lresolv]) ]) ]) @@ -558,7 +556,7 @@ AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [ # FreeBSD has a gnugetopt library for this: AC_CHECK_LIB([gnugetopt],[getopt_long], [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) - VLC_ADD_LDFLAGS([vlc],[-lgnugetopt])], + VLC_ADD_LDFLAGS([libvlc],[-lgnugetopt])], [need_getopt=:])]) fi AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) @@ -599,7 +597,7 @@ if test "${ac_cv_have_plugins}" = "no"; then [ac_cv_my_have_shl_load=yes, AC_CHECK_LIB(dld, shl_load, [ac_cv_my_have_shl_load=yes - VLC_ADD_LDFLAGS([vlc],[-ldld])])]) + VLC_ADD_LDFLAGS([libvlc],[-ldld])])]) if test "${ac_cv_my_have_shl_load}" = "yes"; then AC_DEFINE(HAVE_DL_SHL_LOAD, 1, [Define if you have the shl_load API]) ac_cv_have_plugins=yes @@ -609,7 +607,7 @@ fi # Whatever style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_LIB(dld, dld_link, - [VLC_ADD_LDFLAGS([vlc],[-ldld]) + [VLC_ADD_LDFLAGS([libvlc],[-ldld]) AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library]) ac_cv_have_plugins=yes]) fi @@ -618,7 +616,7 @@ fi if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then AC_CHECK_LIB(kernel32, main, - [VLC_ADD_LDFLAGS([vlc],[-lkernel32]) + [VLC_ADD_LDFLAGS([libvlc],[-lkernel32]) AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes]) fi @@ -648,10 +646,10 @@ if test "${ac_cv_have_plugins}" = "no"; then ac_cv_my_have_dlopen=yes, AC_CHECK_LIB(dl, dlopen, ac_cv_my_have_dlopen=yes - VLC_ADD_LDFLAGS([vlc],[-ldl]), + VLC_ADD_LDFLAGS([libvlc],[-ldl]), AC_CHECK_LIB(svld, dlopen, ac_cv_my_have_dlopen=yes - VLC_ADD_LDFLAGS([vlc],[-lsvld])))) + VLC_ADD_LDFLAGS([libvlc],[-lsvld])))) if test "${ac_cv_my_have_dlopen}" = "yes"; then AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API]) ac_cv_have_plugins=yes @@ -716,24 +714,24 @@ AC_ARG_ENABLE(st, fi ]) -VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) +VLC_ADD_LDFLAGS([libvlc plugin],[${THREAD_LIB}]) dnl Don't link with rt when using GNU-pth if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then AC_CHECK_LIB(rt, clock_nanosleep, [ - VLC_ADD_LDFLAGS([vlc],[-lrt]) + VLC_ADD_LDFLAGS([libvlc],[-lrt]) AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.]) ], [ dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) + AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([libvlc],[-lrt])]) ]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ AC_CHECK_LIB(rt,nanosleep, - [VLC_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:], + [VLC_ADD_LDFLAGS([libvlc],[-lrt]) have_nanosleep=:], [AC_CHECK_LIB(posix4,nanosleep, - [VLC_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])] + [VLC_ADD_LDFLAGS([libvlc],[-lposix4]) have_nanosleep=:])] ) ]) if ${have_nanosleep}; then @@ -829,14 +827,14 @@ then [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API]) AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] ) VLC_ADD_PLUGINS([hal probe_hal]) - VLC_ADD_LDFLAGS([vlc hal probe_hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal probe_hal],[$HAL_CFLAGS])], + VLC_ADD_LDFLAGS([libvlc hal probe_hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([libvlc hal probe_hal],[$HAL_CFLAGS])], dnl No hal 0.5 Test for 0.2 [ PKG_CHECK_MODULES( HAL, hal >= 0.2.97, [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library]) VLC_ADD_PLUGINS([hal]) - VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], + VLC_ADD_LDFLAGS([libvlc hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([libvlc hal],[$HAL_CFLAGS])], [AC_MSG_WARN(HAL library not found)]) ] ) @@ -854,8 +852,8 @@ then AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] ) AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30] ) AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) - VLC_ADD_LDFLAGS([screensaver vlc],[$DBUS_LIBS]) - VLC_ADD_CFLAGS([screensaver vlc],[$DBUS_CFLAGS]) + VLC_ADD_LDFLAGS([screensaver libvlc],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS]) dnl Check for dbus control interface AC_ARG_ENABLE(dbus-control, [ --enable-dbus-control D-BUS control interface (default disabled)]) if test "${enable_dbus_control}" = "yes" @@ -1274,7 +1272,7 @@ if test "${ac_cv_altivec_inline}" != "no"; then VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) - VLC_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([libvlc],[${ac_cv_altivec_inline}]) fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -1334,7 +1332,7 @@ CPPFLAGS="${CPPFLAGS_save}" if test "${ac_cv_c_altivec}" != "no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) - VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}]) + VLC_ADD_CFLAGS([libvlc],[${ac_cv_c_altivec}]) VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}]) VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}]) if test "${ac_cv_altivec_inline}" = "no"; then @@ -1349,7 +1347,7 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS="${LDFLAGS_save}" ]) if test "${ac_cv_ld_altivec}" != "no"; then - VLC_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) + VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) fi fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -5458,7 +5456,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ - VLC_ADD_LDFLAGS([vlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) + VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) ]) fi @@ -5600,7 +5598,7 @@ VLC_RESTORE_FLAGS dnl dnl Create the vlc-config script dnl -LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtin}" +LDFLAGS_libvlc="${LDFLAGS_libvlc} ${LDFLAGS_builtin}" for i in `echo "${BUILTINS}" | sed -e 's@[^ ]*/@@g'` ; do LDFLAGS_libvlc="${LDFLAGS_libvlc} ${libdir}/vlc/${i}.a `eval echo '$'{LDFLAGS_${i}}`" ; done dnl diff --git a/evc/plugins.vcp.in b/evc/plugins.vcp.in index 53227186df..9c916bf910 100644 --- a/evc/plugins.vcp.in +++ b/evc/plugins.vcp.in @@ -70,7 +70,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r CPP=clmips.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -103,7 +103,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r CPP=clmips.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -136,7 +136,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r CPP=shcl.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Qsh4 /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -169,7 +169,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r CPP=shcl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /Qsh4 /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -202,7 +202,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r CPP=shcl.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -235,7 +235,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r CPP=shcl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -268,7 +268,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -301,7 +301,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -334,7 +334,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /Gz /Oxs /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -367,7 +367,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /Gz /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -399,7 +399,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c -# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /c +# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -431,7 +431,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c -# ADD CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /O2 /c +# ADD CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /O2 /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -463,7 +463,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c -# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /c +# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -495,7 +495,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c -# ADD CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /O2 /c +# ADD CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gs8192 /GF /O2 /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -527,7 +527,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -559,7 +559,7 @@ RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c -# ADD CPP /nologo /W3 /I "." /I "..\include" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c +# ADD CPP /nologo /W3 /I "." /I "..\include" /D "__LIBVLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 diff --git a/include/iso_lang.h b/include/iso_lang.h index 9e0022fdb8..ed984e561e 100644 --- a/include/iso_lang.h +++ b/include/iso_lang.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + struct iso639_lang_t { const char * psz_eng_name; /* Description in English */ diff --git a/include/main.h b/include/main.h index 914a7514c0..f9afd9faaa 100644 --- a/include/main.h +++ b/include/main.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** * libvlc_global_data_t (global variable) ***************************************************************************** diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h index 400075dc86..0f11446328 100644 --- a/include/vlc/vlc.h +++ b/include/vlc/vlc.h @@ -148,14 +148,14 @@ struct vlc_list_t /***************************************************************************** * Required internal headers *****************************************************************************/ -#if defined( __VLC__ ) +#if defined( __LIBVLC__ ) # include "vlc_common.h" #endif /***************************************************************************** * Exported libvlc API *****************************************************************************/ -#if !defined( __VLC__ ) +#if !defined( __LIBVLC__ ) /* Otherwise they are declared and exported in vlc_common.h */ /** * Retrieve libvlc version @@ -214,7 +214,7 @@ char const * VLC_Changeset ( void ); */ char const * VLC_Error ( int i_err ); -#endif /* __VLC__ */ +#endif /* __LIBVLC__ */ /** * Initialize libvlc diff --git a/include/vlc_access.h b/include/vlc_access.h index 6d1126a67a..380bdbc350 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_ACCESS_H #define _VLC_ACCESS_H 1 diff --git a/include/vlc_acl.h b/include/vlc_acl.h index 3c706a569c..bc131a45a8 100644 --- a/include/vlc_acl.h +++ b/include/vlc_acl.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef __VLC_ACL_H # define __VLC_ACL_H diff --git a/include/vlc_aout.h b/include/vlc_aout.h index e4fee7483f..d3f20b6cf9 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -20,6 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_AOUT_H #define _VLC_AOUT_H 1 diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index bc165cd1df..aa19662d8d 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -21,6 +21,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_ARRAYS_H_ #define _VLC_ARRAYS_H_ diff --git a/include/vlc_bits.h b/include/vlc_bits.h index 1a6bab6071..9d77c473ce 100644 --- a/include/vlc_bits.h +++ b/include/vlc_bits.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_BITS_H #define _VLC_BITS_H 1 diff --git a/include/vlc_block.h b/include/vlc_block.h index ea9bb0ce43..5f1366efed 100644 --- a/include/vlc_block.h +++ b/include/vlc_block.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_BLOCK_H #define _VLC_BLOCK_H 1 diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index e5e160dd11..35652e9824 100644 --- a/include/vlc_block_helper.h +++ b/include/vlc_block_helper.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_BLOCK_HELPER_H #define _VLC_BLOCK_HELPER_H 1 diff --git a/include/vlc_charset.h b/include/vlc_charset.h index eec9d42973..66f0d4f403 100644 --- a/include/vlc_charset.h +++ b/include/vlc_charset.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef __VLC_CHARSET_H #define __VLC_CHARSET_H 1 diff --git a/include/vlc_codec.h b/include/vlc_codec.h index 86bfe01fe4..79fa42132d 100644 --- a/include/vlc_codec.h +++ b/include/vlc_codec.h @@ -20,6 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_CODEC_H #define _VLC_CODEC_H 1 diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 1e4117ce73..c7232eab43 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_CODECS_H #define _VLC_CODECS_H 1 diff --git a/include/vlc_config.h b/include/vlc_config.h index 1a67c39d41..64d902739a 100644 --- a/include/vlc_config.h +++ b/include/vlc_config.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /* Conventions regarding names of symbols and variables * ---------------------------------------------------- * diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index 670125f7ee..931fc52afc 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_HELP_H #define _VLC_HELP_H 1 diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h index bdbb110264..1212aacaf6 100644 --- a/include/vlc_configuration.h +++ b/include/vlc_configuration.h @@ -23,6 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + # ifdef __cplusplus extern "C" { # endif diff --git a/include/vlc_demux.h b/include/vlc_demux.h index ce2a695def..97982ebc35 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_DEMUX_H #define _VLC_DEMUX_H 1 diff --git a/include/vlc_devices.h b/include/vlc_devices.h index 60b065577a..e2b88e04b6 100644 --- a/include/vlc_devices.h +++ b/include/vlc_devices.h @@ -20,6 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_DEVICES_H #define _VLC_DEVICES_H 1 diff --git a/include/vlc_es.h b/include/vlc_es.h index f9d36bd1c5..ba78dec76f 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_ES_H #define _VLC_ES_H 1 diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h index dbb0da4821..10a1723e6b 100644 --- a/include/vlc_es_out.h +++ b/include/vlc_es_out.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_ES_OUT_H #define _VLC_ES_OUT_H 1 diff --git a/include/vlc_filter.h b/include/vlc_filter.h index d81cb77246..4e420c24ee 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -20,6 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_FILTER_H #define _VLC_FILTER_H 1 diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 708882988a..b2e2123653 100644 --- a/include/vlc_httpd.h +++ b/include/vlc_httpd.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_HTTPD_H #define _VLC_HTTPD_H 1 diff --git a/include/vlc_image.h b/include/vlc_image.h index c554564a90..ab1031b20f 100644 --- a/include/vlc_image.h +++ b/include/vlc_image.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_IMAGE_H #define _VLC_IMAGE_H 1 diff --git a/include/vlc_input.h b/include/vlc_input.h index a6825f30e8..c1e43aeadc 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /* __ is need because conflict with */ #ifndef _VLC__INPUT_H #define _VLC__INPUT_H 1 diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 5ec3609833..0dfe482360 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -23,6 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_INTF_H_ #define _VLC_INTF_H_ diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h index 934b03b57b..f0d110d06d 100644 --- a/include/vlc_intf_strings.h +++ b/include/vlc_intf_strings.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_ISTRINGS_H #define _VLC_ISTRINGS_H 1 diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 79f8632a9b..e7fc34c10a 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #define KEY_MODIFIER 0xFF000000 #define KEY_MODIFIER_ALT 0x01000000 #define KEY_MODIFIER_SHIFT 0x02000000 diff --git a/include/vlc_md5.h b/include/vlc_md5.h index 5cd1f9f4cf..66d52efa78 100644 --- a/include/vlc_md5.h +++ b/include/vlc_md5.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_MD5_H # define _VLC_MD5_H diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 2e0a3f3965..6ad4c0a281 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -24,6 +24,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + +#ifndef _VLC_MESSAGES_H_ +#define _VLC_MESSAGES_H_ + #include int vlc_mutex_lock( vlc_mutex_t * ) ; @@ -409,3 +416,5 @@ VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, unsigned int) ); VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) ); #define stats_TimersClean(a) __stats_TimersClean( VLC_OBJECT(a) ) VLC_EXPORT( void, __stats_TimersClean, (vlc_object_t * ) ); + +#endif diff --git a/include/vlc_meta.h b/include/vlc_meta.h index 208b3325a9..77b16a24ba 100644 --- a/include/vlc_meta.h +++ b/include/vlc_meta.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_META_H #define _VLC_META_H 1 diff --git a/include/vlc_modules.h b/include/vlc_modules.h index c6ea64ebc9..7f724bdf5f 100644 --- a/include/vlc_modules.h +++ b/include/vlc_modules.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #define MODULE_SHORTCUT_MAX 50 /* The module handle type. */ diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h index 1d40364224..b4c4988ee1 100644 --- a/include/vlc_modules_macros.h +++ b/include/vlc_modules_macros.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** * If we are not within a module, assume we're in the vlc core. *****************************************************************************/ diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h index 458cf35d35..30460698c6 100644 --- a/include/vlc_mtime.h +++ b/include/vlc_mtime.h @@ -1,5 +1,6 @@ /***************************************************************************** - * mtime.h: high resolution time management functions + * vlc_mtime.h: high resolution time management functions + ***************************************************************************** * This header provides portable high precision time management functions, * which should be the only ones used in other segments of the program, since * functions like gettimeofday() and ftime() are not always supported. @@ -28,6 +29,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** * LAST_MDATE: date which will never happen ***************************************************************************** diff --git a/include/vlc_network.h b/include/vlc_network.h index 832bbf0e64..417fcd51b2 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -1,5 +1,5 @@ /***************************************************************************** - * network.h: interface to communicate with network plug-ins + * vlc_network.h: interface to communicate with network plug-ins ***************************************************************************** * Copyright (C) 2002-2005 the VideoLAN team * $Id$ @@ -23,6 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef __VLC_NETWORK_H # define __VLC_NETWORK_H diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 6440a28dca..36df664f8a 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /** * \file * This file defines the vlc_object_t structure and object types. diff --git a/include/vlc_os_specific.h b/include/vlc_os_specific.h index f3153a2cc8..a329f223fd 100644 --- a/include/vlc_os_specific.h +++ b/include/vlc_os_specific.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _NEED_OS_SPECIFIC_H # define _NEED_OS_SPECIFIC_H 1 #endif diff --git a/include/vlc_osd.h b/include/vlc_osd.h index 0eb2cb1c68..c379e3cb75 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -27,6 +27,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_OSD_H #define _VLC_OSD_H 1 diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index 82fdc9377b..78be38167d 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_PLAYLIST_H_ #define _VLC_PLAYLIST_H_ diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 6c4531ec84..b9192b8a3e 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -24,6 +24,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_SOUT_H_ #define _VLC_SOUT_H_ diff --git a/include/vlc_stream.h b/include/vlc_stream.h index f887fd1c51..6f02e8b5cb 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_STREAM_H #define _VLC_STREAM_H 1 diff --git a/include/vlc_streaming.h b/include/vlc_streaming.h index d148955556..c1e9e6220d 100644 --- a/include/vlc_streaming.h +++ b/include/vlc_streaming.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_STREAMING_H_ #define _VLC_STREAMING_H_ diff --git a/include/vlc_strings.h b/include/vlc_strings.h index 7c1c1e0469..a7468746d4 100644 --- a/include/vlc_strings.h +++ b/include/vlc_strings.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_STRINGS_H #define _VLC_STRINGS_H 1 diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 9627fc1fc0..e36a07cdf0 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -25,6 +25,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #include #if defined(DEBUG) && defined(HAVE_SYS_TIME_H) diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h index 311b745164..aa4b6d2d48 100644 --- a/include/vlc_threads_funcs.h +++ b/include/vlc_threads_funcs.h @@ -25,6 +25,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** * Function definitions *****************************************************************************/ diff --git a/include/vlc_tls.h b/include/vlc_tls.h index 12d37a1bb9..0472959e40 100644 --- a/include/vlc_tls.h +++ b/include/vlc_tls.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_TLS_H # define _VLC_TLS_H diff --git a/include/vlc_update.h b/include/vlc_update.h index cc441b8372..fd4aa04ed0 100644 --- a/include/vlc_update.h +++ b/include/vlc_update.h @@ -21,6 +21,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_UPDATE_H #define _VLC_UPDATE_H diff --git a/include/vlc_url.h b/include/vlc_url.h index 7804ed9b07..068d970cac 100644 --- a/include/vlc_url.h +++ b/include/vlc_url.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef __VLC_URL_H # define __VLC_URL_H diff --git a/include/vlc_variables.h b/include/vlc_variables.h index 630d36d45a..05d929e711 100644 --- a/include/vlc_variables.h +++ b/include/vlc_variables.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /** * \defgroup variables Variables * diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h index fcb90b6d07..af0d6904cf 100644 --- a/include/vlc_vlm.h +++ b/include/vlc_vlm.h @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_VLM_H #define _VLC_VLM_H 1 diff --git a/include/vlc_vod.h b/include/vlc_vod.h index ca82e76a24..fab8bc3a06 100644 --- a/include/vlc_vod.h +++ b/include/vlc_vod.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_VOD_H #define _VLC_VOD_H 1 diff --git a/include/vlc_vout.h b/include/vlc_vout.h index 2527466cb2..23ea5e7cca 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -22,6 +22,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_VOUT_H_ #define _VLC_VOUT_H_ 1 diff --git a/include/vlc_vout_synchro.h b/include/vlc_vout_synchro.h index c86599d27d..1d3daf7e00 100644 --- a/include/vlc_vout_synchro.h +++ b/include/vlc_vout_synchro.h @@ -24,6 +24,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** * vout_synchro_t : timers for the video synchro *****************************************************************************/ diff --git a/include/vlc_xml.h b/include/vlc_xml.h index 4b6d4d12a8..b43ad9cf7b 100644 --- a/include/vlc_xml.h +++ b/include/vlc_xml.h @@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_XML_H #define _VLC_XML_H diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c index dc9893e46c..5a8abaf5a1 100644 --- a/modules/demux/mp4/drms.c +++ b/modules/demux/mp4/drms.c @@ -30,7 +30,7 @@ # include #endif -#ifdef __VLC__ +#ifdef __LIBVLC__ # include # include # include "libmp4.h" @@ -90,7 +90,7 @@ struct aes_s uint32_t pp_dec_keys[ AES_KEY_COUNT + 1 ][ 4 ]; }; -#ifdef __VLC__ +#ifdef __LIBVLC__ # define Digest DigestMD5 #else /***************************************************************************** @@ -146,7 +146,7 @@ struct drms_s static void InitAES ( struct aes_s *, uint32_t * ); static void DecryptAES ( struct aes_s *, uint32_t *, const uint32_t * ); -#ifndef __VLC__ +#ifndef __LIBVLC__ static void InitMD5 ( struct md5_s * ); static void AddMD5 ( struct md5_s *, const uint8_t *, uint32_t ); static void EndMD5 ( struct md5_s * ); @@ -504,7 +504,7 @@ static void DecryptAES( struct aes_s *p_aes, } } -#ifndef __VLC__ +#ifndef __LIBVLC__ /***************************************************************************** * InitMD5: initialise an MD5 message ***************************************************************************** diff --git a/msvc/libvlc.vcproj.in b/msvc/libvlc.vcproj.in index 1afb7895a4..efd798313f 100644 --- a/msvc/libvlc.vcproj.in +++ b/msvc/libvlc.vcproj.in @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;__VLC__" + PreprocessorDefinitions="WIN32;_DEBUG;__LIBVLC__" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -66,7 +66,7 @@ > ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} # End Source File${M} EOF done @@ -195,7 +195,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} # PROP Output_Dir "MIPSRel\\${subdir}"${M} # PROP Intermediate_Dir "MIPSRel\\${subdir}"${M} @@ -251,7 +251,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} +# ADD CPP /D "__LIBVLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} !IF "\$(CFG)" == "libvlc - Win32 Release"${M} # PROP Output_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "Release\\${subdir}"${M} @@ -318,7 +318,7 @@ EOF cat >> ${target} << EOF # Begin Source File${M} SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M} -# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M} +# ADD CPP /D "__LIBVLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M} !IF "\$(CFG)" == "plugin_${mod} - Win32 Release"${M} # PROP Output_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} # PROP Intermediate_Dir "Release\\modules\\`echo ${dir} | sed 's,/,\\\\,g'`"${M} diff --git a/vlc-config.in.in b/vlc-config.in.in index 45ebe32558..0585089602 100644 --- a/vlc-config.in.in +++ b/vlc-config.in.in @@ -193,16 +193,16 @@ while test $# -gt 0; do -*) usage 1 1>&1 ;; - vlc) - cppflags="${cppflags} -D__VLC__ -I${top_builddir}src/misc" + libvlc) + cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc" ;; plugin) echo_plugin=yes - cppflags="${cppflags} -D__VLC__ -D__PLUGIN__" + cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__" ;; builtin) echo_builtin=yes - cppflags="${cppflags} -D__VLC__ -D__BUILTIN__" + cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__" ;; pic) ;; -- 2.39.2