Embryo: fix compilation on Windows CE and link with Evil
* use fseek() instead of rewind() as the latter does not exist on Windows CE * fix compilation with Evil. SVN revision: 63850
This commit is contained in:
parent
163272dc48
commit
f3e531b7a7
|
@ -9,3 +9,8 @@
|
||||||
2011-07-16 Vincent Torri
|
2011-07-16 Vincent Torri
|
||||||
|
|
||||||
* delete temporary files on Windows
|
* delete temporary files on Windows
|
||||||
|
|
||||||
|
2011-10-05 Vincent Torri
|
||||||
|
|
||||||
|
* use fseek() instead of rewind() as the latter does not exist on
|
||||||
|
Windows CE and fix compilation with Evil.
|
||||||
|
|
|
@ -10,6 +10,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)\" \
|
||||||
|
@EVIL_CFLAGS@ \
|
||||||
@EMBRYO_CPPFLAGS@ \
|
@EMBRYO_CPPFLAGS@ \
|
||||||
@EFL_EMBRYO_BUILD@
|
@EFL_EMBRYO_BUILD@
|
||||||
|
|
||||||
|
@ -28,7 +29,7 @@ embryo_str.c \
|
||||||
embryo_time.c
|
embryo_time.c
|
||||||
|
|
||||||
libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
|
libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
|
||||||
libembryo_la_LIBADD = -lm
|
libembryo_la_LIBADD = @EVIL_LIBS@ -lm
|
||||||
libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
||||||
|
|
||||||
EXTRA_DIST = embryo_private.h
|
EXTRA_DIST = embryo_private.h
|
||||||
|
|
|
@ -29,10 +29,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifdef HAVE_EVIL
|
|
||||||
# include <Evil.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "Embryo.h"
|
#include "Embryo.h"
|
||||||
#include "embryo_private.h"
|
#include "embryo_private.h"
|
||||||
|
|
||||||
|
@ -290,7 +286,7 @@ embryo_program_load(const char *file)
|
||||||
if (!f) return NULL;
|
if (!f) return NULL;
|
||||||
fseek(f, 0, SEEK_END);
|
fseek(f, 0, SEEK_END);
|
||||||
program_size = ftell(f);
|
program_size = ftell(f);
|
||||||
rewind(f);
|
fseek(f, 0L, SEEK_SET);
|
||||||
if (program_size < (int)sizeof(Embryo_Header))
|
if (program_size < (int)sizeof(Embryo_Header))
|
||||||
{
|
{
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
@ -301,7 +297,7 @@ embryo_program_load(const char *file)
|
||||||
fclose(f);
|
fclose(f);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
rewind(f);
|
fseek(f, 0L, SEEK_SET);
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
embryo_swap_32((unsigned int *)(&hdr.size));
|
embryo_swap_32((unsigned int *)(&hdr.size));
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue