diff options
| author | Cedric Bail <cedric.bail@free.fr> | 2013-03-15 11:00:19 +0100 |
|---|---|---|
| committer | Cedric Bail <cedric.bail@free.fr> | 2013-03-16 15:40:35 +0900 |
| commit | 69b5868005962989e04c945407d868e17e28ad1a (patch) | |
| tree | 00458e2267c5117688e7da846c93b561c869a750 | |
| parent | 8866220a6d8f858e2aa1b2344264a7a591a92cd0 (diff) | |
| download | efl-69b5868005962989e04c945407d868e17e28ad1a.tar.gz | |
edje: fix epp compilation on Windows.
| -rw-r--r-- | src/Makefile_Edje.am | 3 | ||||
| -rw-r--r-- | src/bin/edje/epp/cppexp.c | 6 | ||||
| -rw-r--r-- | src/bin/edje/epp/cpplib.c | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 94e05a33fe..0c71e4bb00 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -184,6 +184,9 @@ $(CWARNFLAGS) \ -DTARGET_CR=13 \ -DTARGET_TAB=9 \ -DTARGET_VT=11 +if HAVE_WIN32 +bin_edje_epp_epp_LDADD = lib/evil/libevil.la +endif # TODO: why keep these? EXTRA_DIST += \ diff --git a/src/bin/edje/epp/cppexp.c b/src/bin/edje/epp/cppexp.c index c5712c0c76..d61e05459c 100644 --- a/src/bin/edje/epp/cppexp.c +++ b/src/bin/edje/epp/cppexp.c @@ -45,6 +45,12 @@ #include "cpplib.h" #include "cpphash.h" +#ifdef _WIN32 +# ifdef ERROR +# undef ERROR +# endif +#endif + /* This is used for communicating lists of keywords with cccp.c. */ struct arglist { struct arglist *next; diff --git a/src/bin/edje/epp/cpplib.c b/src/bin/edje/epp/cpplib.c index 163075f90f..d7018fd507 100644 --- a/src/bin/edje/epp/cpplib.c +++ b/src/bin/edje/epp/cpplib.c @@ -79,7 +79,9 @@ const char *version_string = "0.0.0"; #ifndef USG #include <time.h> #include <sys/time.h> /* for __DATE__ and __TIME__ */ -#include <sys/resource.h> +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #else #include <sys/param.h> /* CYGNUS LOCAL: shebs -noquiet */ #include <sys/times.h> |