eolian: add right extension to eolian_gen if we are on Windows

In previous version of this commit we checked if the _WIN32 macro was
defined. But now I am using EXEEXT from autotools to get
eolian_gen extension.

@fix
This commit is contained in:
michelle legrand 2015-02-03 10:15:15 +01:00 committed by Cedric BAIL
parent 9579624765
commit bbba9198db
2 changed files with 3 additions and 8 deletions

View File

@ -223,6 +223,7 @@ esac
AC_SUBST([MODULE_ARCH])
AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
AC_DEFINE_UNQUOTED([EXEEXT], ["${EXEEXT}"], [Suffix for binary objects])
# TODO: move me to m4 file that setups the windows related variables
AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])

View File

@ -72,15 +72,9 @@ _eolian_gen_execute(const char *eo_filename, const char *options, const char *ou
if (getenv("EFL_RUN_IN_TREE"))
{
#ifdef _WIN32
snprintf(eolian_gen_path, sizeof(eolian_gen_path),
"%s/src/bin/eolian/eolian_gen.exe",
PACKAGE_BUILD_DIR);
#else
snprintf(eolian_gen_path, sizeof(eolian_gen_path),
"%s/src/bin/eolian/eolian_gen",
PACKAGE_BUILD_DIR);
#endif
"%s/src/bin/eolian/eolian_gen%s",
PACKAGE_BUILD_DIR, EXEEXT);
}
if (eolian_gen_path[0] == '\0')
return -1;