cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=bbba9198dbd35dfa67f8a42fe2d16f144abb7181

commit bbba9198dbd35dfa67f8a42fe2d16f144abb7181
Author: michelle legrand <michelle.legr...@openwide.fr>
Date:   Tue Feb 3 10:15:15 2015 +0100

    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
---
 configure.ac                         |  1 +
 src/tests/eolian/eolian_generation.c | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index b94f60d..57c267a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"])
diff --git a/src/tests/eolian/eolian_generation.c 
b/src/tests/eolian/eolian_generation.c
index f3ccc71..40ddb74 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -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;

-- 


Reply via email to