enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Make Ephoto's thumbnailer build on Windows.

This commit is contained in:
Vincent Torri 2016-05-31 14:55:38 -05:00 committed by Stephen okra Houston
parent 737fb734a2
commit 48e39bc41b
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -10,6 +10,17 @@ AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(src/bin/config.h) AC_CONFIG_HEADERS(src/bin/config.h)
AC_CANONICAL_HOST
have_win32="no"
case "$host_os" in
mingw*)
have_win32="yes"
;;
esac
AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
AM_INIT_AUTOMAKE(1.6 dist-xz) AM_INIT_AUTOMAKE(1.6 dist-xz)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -55,6 +66,8 @@ PKG_CHECK_MODULES([EFL], [
efreet-mime >= 1.7.0 efreet-mime >= 1.7.0
]) ])
AC_CHECK_FUNCS([nice])
AC_ARG_WITH([tests], AC_ARG_WITH([tests],
[AC_HELP_STRING([--with-tests=none|regular|coverage], [AC_HELP_STRING([--with-tests=none|regular|coverage],
[choose testing method: regular, coverage, or none. [choose testing method: regular, coverage, or none.
@ -92,6 +105,8 @@ echo "------------------------------------------------------------------------"
echo "$PACKAGE_NAME $PACKAGE_VERSION" echo "$PACKAGE_NAME $PACKAGE_VERSION"
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
echo echo
echo "Host.....................: ${host_os}"
echo
echo "Compilation..............: make (or gmake)" echo "Compilation..............: make (or gmake)"
echo " CPPFLAGS...............: $CPPFLAGS" echo " CPPFLAGS...............: $CPPFLAGS"
echo " CFLAGS.................: $CFLAGS" echo " CFLAGS.................: $CFLAGS"

8
src/bin/Makefile.am
View File

@ -51,6 +51,14 @@ ephoto_thumbnail_CPPFLAGS = \
ephoto_thumbnail_LDADD = @EFL_LIBS@ ephoto_thumbnail_LDADD = @EFL_LIBS@
if HAVE_WIN32
ephoto_thumbnail_LDADD += -lws2_32
endif
if HAVE_PO
ephoto_thumbnail_LDADD += @LTLIBINTL@
endif
ephoto_thumbnail_SOURCES = \ ephoto_thumbnail_SOURCES = \
ephoto_thumbnailer.c \ ephoto_thumbnailer.c \
ephoto_ipc.c \ ephoto_ipc.c \

2
src/bin/ephoto_slideshow.c
View File

@ -306,7 +306,7 @@ ephoto_slideshow_show_controls(Ephoto *ephoto)
_add_icon(ss->notify, "view-fullscreen", _("Fullscreen"), NULL); _add_icon(ss->notify, "view-fullscreen", _("Fullscreen"), NULL);
evas_object_smart_callback_add(ss->fullscreen, "clicked", _fullscreen, ss); evas_object_smart_callback_add(ss->fullscreen, "clicked", _fullscreen, ss);
ss->fullscreen_after = ss->fullscreen_after =
_add_icon(ss->notify, "preferences-system", _("Settings"), NULL); _add_icon(ss->notify, "preferences-other", _("Settings"), NULL);
evas_object_smart_callback_add(ss->fullscreen_after, "clicked", _settings, ss); evas_object_smart_callback_add(ss->fullscreen_after, "clicked", _settings, ss);
elm_layout_content_set(ephoto->layout, "ephoto.swallow.controls", ss->notify); elm_layout_content_set(ephoto->layout, "ephoto.swallow.controls", ss->notify);

6
src/bin/ephoto_thumbnailer.c
View File

@ -7,6 +7,10 @@
# include <netinet/in.h> # include <netinet/in.h>
#endif #endif
#ifdef _WIN32
# include <winsock2.h>
#endif
#define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n)))) #define SHSH(n, v) ((((v) << (n)) & 0xffffffff) | ((v) >> (32 - (n))))
typedef struct _E_Thumb E_Thumb; typedef struct _E_Thumb E_Thumb;
@ -62,6 +66,7 @@ main(int argc,
} }
else if (!strncmp(argv[i], "--nice=", 7)) else if (!strncmp(argv[i], "--nice=", 7))
{ {
#ifdef HAVE_NICE
const char *val; const char *val;
val = argv[i] + 7; val = argv[i] + 7;
@ -69,6 +74,7 @@ main(int argc,
{ {
if (nice(atoi(val)) < 0) perror("nice"); if (nice(atoi(val)) < 0) perror("nice");
} }
#endif
} }
} }