forked from enlightenment/efl
Add preliminary patch for compilation on Windows. Needs more work, though
Patch by Lars Munch - Thanks a lot ! SVN revision: 40147
This commit is contained in:
parent
0f8b812d0c
commit
17e4571dff
|
@ -29,6 +29,26 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
|
||||||
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
|
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
|
||||||
AC_SUBST(version_info)
|
AC_SUBST(version_info)
|
||||||
|
|
||||||
|
EFL_EMOTION_BUILD=""
|
||||||
|
case "$host_os" in
|
||||||
|
mingw* | cegcc*)
|
||||||
|
EFL_EMOTION_BUILD="-DEFL_EMOTION_BUILD"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_SUBST(EFL_EMOTION_BUILD)
|
||||||
|
|
||||||
|
### Checks for linker characteristics
|
||||||
|
|
||||||
|
# use --enable-auto-import on Windows
|
||||||
|
|
||||||
|
lt_enable_auto_import=""
|
||||||
|
case "$host_os" in
|
||||||
|
mingw* | cegcc*)
|
||||||
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_SUBST(lt_enable_auto_import)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
|
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
|
||||||
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
|
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
|
||||||
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-evas >= 0.9.9 ecore-job >= 0.9.9])
|
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-evas >= 0.9.9 ecore-job >= 0.9.9])
|
||||||
|
|
|
@ -1,15 +1,22 @@
|
||||||
#ifndef EMOTION_H
|
#ifndef EMOTION_H
|
||||||
#define EMOTION_H
|
#define EMOTION_H
|
||||||
|
|
||||||
|
#include <Evas.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EAPI
|
||||||
#undef EAPI
|
# undef EAPI
|
||||||
#endif
|
#endif
|
||||||
#ifdef WIN32
|
|
||||||
# ifdef BUILDING_DLL
|
#ifdef _WIN32
|
||||||
# define EAPI __declspec(dllexport)
|
# ifdef EFL_EMOTION_BUILD
|
||||||
|
# ifdef DLL_EXPORT
|
||||||
|
# define EAPI __declspec(dllexport)
|
||||||
|
# else
|
||||||
|
# define EAPI
|
||||||
|
# endif /* ! DLL_EXPORT */
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EAPI __declspec(dllimport)
|
||||||
# endif
|
# endif /* ! EFL_EMOTION_BUILD */
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
|
@ -20,9 +27,7 @@
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EAPI
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
#include <Evas.h>
|
|
||||||
|
|
||||||
enum _Emotion_Module
|
enum _Emotion_Module
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,8 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
@EVAS_CFLAGS@ \
|
@EVAS_CFLAGS@ \
|
||||||
@ECORE_CFLAGS@
|
@ECORE_CFLAGS@ \
|
||||||
|
@EFL_EMOTION_BUILD@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libemotion.la
|
lib_LTLIBRARIES = libemotion.la
|
||||||
include_HEADERS = Emotion.h
|
include_HEADERS = Emotion.h
|
||||||
|
@ -18,4 +19,4 @@ emotion_private.h
|
||||||
|
|
||||||
libemotion_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@
|
libemotion_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@
|
||||||
libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
|
libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
libemotion_la_LDFLAGS = -version-info @version_info@
|
libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "Emotion.h"
|
|
||||||
#include "emotion_private.h"
|
#include "emotion_private.h"
|
||||||
|
#include "Emotion.h"
|
||||||
|
|
||||||
#define E_SMART_OBJ_GET(smart, o, type) \
|
#define E_SMART_OBJ_GET(smart, o, type) \
|
||||||
{ \
|
{ \
|
||||||
|
|
|
@ -7,6 +7,7 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
|
@EFL_EMOTION_BUILD@ \
|
||||||
@EVAS_CFLAGS@ \
|
@EVAS_CFLAGS@ \
|
||||||
@ECORE_CFLAGS@ \
|
@ECORE_CFLAGS@ \
|
||||||
@GST_CFLAGS@
|
@GST_CFLAGS@
|
||||||
|
@ -27,7 +28,7 @@ emotion_gstreamer_pipeline_file.c \
|
||||||
emotion_gstreamer_pipeline_uri.c \
|
emotion_gstreamer_pipeline_uri.c \
|
||||||
emotion_gstreamer_pipeline_v4l.c
|
emotion_gstreamer_pipeline_v4l.c
|
||||||
gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la
|
gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la
|
||||||
gstreamer_la_LDFLAGS = -module -avoid-version
|
gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||||
gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
|
gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
|
gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,10 @@
|
||||||
|
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
|
|
||||||
#include "Emotion.h"
|
|
||||||
#include "emotion_private.h"
|
#include "emotion_private.h"
|
||||||
#include "emotion_gstreamer.h"
|
#include "emotion_gstreamer.h"
|
||||||
#include "emotion_gstreamer_pipeline.h"
|
#include "emotion_gstreamer_pipeline.h"
|
||||||
|
#include "Emotion.h"
|
||||||
|
|
||||||
/* Callbacks to get the eos */
|
/* Callbacks to get the eos */
|
||||||
static int _eos_timer_fct (void *data);
|
static int _eos_timer_fct (void *data);
|
||||||
|
|
|
@ -22,7 +22,7 @@ vlc_la_SOURCES = \
|
||||||
emotion_vlc.c \
|
emotion_vlc.c \
|
||||||
emotion_vlc.h
|
emotion_vlc.h
|
||||||
vlc_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
|
vlc_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
|
||||||
vlc_la_LDFLAGS = -module -avoid-version
|
vlc_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||||
vlc_la_LIBTOOLFLAGS = --tag=disable-static
|
vlc_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
vlc_la_DEPENDENCIES = $(top_builddir)/config.h
|
vlc_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ emotion_xine.c \
|
||||||
emotion_xine.h \
|
emotion_xine.h \
|
||||||
emotion_xine_vo_out.c
|
emotion_xine_vo_out.c
|
||||||
xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
|
xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
|
||||||
xine_la_LDFLAGS = -module -avoid-version
|
xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||||
xine_la_LIBTOOLFLAGS = --tag=disable-static
|
xine_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
xine_la_DEPENDENCIES = $(top_builddir)/config.h
|
xine_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue