compile in windows again - i think. eapi hackery.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@51638 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 5b5a85d..65d08f3 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -45,8 +45,8 @@ edje_player_SOURCES = edje_player.c
 edje_player_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
 edje_player_LDFLAGS = @lt_enable_auto_import@
 
-edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c ../lib/edje_data.c
-edje_convert_LDADD = $(EVIL_LIBS) @MINIMAL_LIBS@ -lm
+edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
+edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
 edje_convert_LDFLAGS = @lt_enable_auto_import@
 
 EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h

diff --git a/src/lib/edje_data.c b/src/lib/edje_data.c
index dda0e12..7343512 100644 (file)
--- a/src/lib/edje_data.c
+++ b/src/lib/edje_data.c
@@ -148,7 +148,8 @@ _edje_eina_hash_add_alloc(Eina_Hash  *hash,
    return hash;
 }
 
-void
+// FIXME: remove EAPI wehn edje_convert goes
+EAPI void
 _edje_edd_shutdown(void)
 {
    FREED(_edje_edd_edje_file);
@@ -212,7 +213,8 @@ _edje_edd_shutdown(void)
      EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_##Name##_pointer, Edje_##Type##_Pointer, "pointer", pointer, _edje_edd_edje_##Name); \
    }
 
-void
+// FIXME: remove EAPI when edje_convert goes
+EAPI void
 _edje_edd_init(void)
 {
    Eet_Data_Descriptor_Class eddc;

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 4f908ba..9d85edd 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -1365,6 +1365,10 @@ const Eina_List *edje_match_signal_source_hash_get(const char *signal,
                                                   const Eina_Rbtree *tree);
 void edje_match_signal_source_free(Edje_Signal_Source_Char *key, void *data);
 
+// FIXME remove below 2 eapi decls wehn edje_convert goes
+EAPI void _edje_edd_init(void);
+EAPI void _edje_edd_shutdown(void);
+
 EAPI extern Eet_Data_Descriptor *_edje_edd_edje_file;
 EAPI extern Eet_Data_Descriptor *_edje_edd_edje_part_collection;