diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/embryo/src | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/embryo/src')
-rw-r--r-- | libraries/embryo/src/Makefile.in | 5 | ||||
-rw-r--r-- | libraries/embryo/src/bin/Makefile.in | 5 | ||||
-rw-r--r-- | libraries/embryo/src/bin/embryo_cc_sc5.scp | 2 | ||||
-rw-r--r-- | libraries/embryo/src/bin/embryo_cc_sc7.scp | 2 | ||||
-rw-r--r-- | libraries/embryo/src/lib/Embryo.h | 2 | ||||
-rw-r--r-- | libraries/embryo/src/lib/Makefile.am | 3 | ||||
-rw-r--r-- | libraries/embryo/src/lib/Makefile.in | 8 | ||||
-rw-r--r-- | libraries/embryo/src/lib/embryo_amx.c | 4 | ||||
-rw-r--r-- | libraries/embryo/src/lib/embryo_str.c | 45 | ||||
-rw-r--r-- | libraries/embryo/src/lib/embryo_time.c | 6 |
10 files changed, 60 insertions, 22 deletions
diff --git a/libraries/embryo/src/Makefile.in b/libraries/embryo/src/Makefile.in index ff3d123..e060803 100644 --- a/libraries/embryo/src/Makefile.in +++ b/libraries/embryo/src/Makefile.in | |||
@@ -39,6 +39,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||
39 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ |
40 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ | 40 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ |
41 | $(top_srcdir)/m4/efl_fnmatch.m4 \ | 41 | $(top_srcdir)/m4/efl_fnmatch.m4 \ |
42 | $(top_srcdir)/m4/efl_gettimeofday.m4 \ | ||
42 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ | 43 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ |
43 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | 44 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
44 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | 45 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
@@ -133,6 +134,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ | |||
133 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 134 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
134 | EVIL_LIBS = @EVIL_LIBS@ | 135 | EVIL_LIBS = @EVIL_LIBS@ |
135 | EXEEXT = @EXEEXT@ | 136 | EXEEXT = @EXEEXT@ |
137 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
138 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
136 | FGREP = @FGREP@ | 139 | FGREP = @FGREP@ |
137 | GREP = @GREP@ | 140 | GREP = @GREP@ |
138 | INSTALL = @INSTALL@ | 141 | INSTALL = @INSTALL@ |
@@ -165,6 +168,8 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
165 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 168 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
166 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 169 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
167 | PKG_CONFIG = @PKG_CONFIG@ | 170 | PKG_CONFIG = @PKG_CONFIG@ |
171 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
172 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
168 | RANLIB = @RANLIB@ | 173 | RANLIB = @RANLIB@ |
169 | SED = @SED@ | 174 | SED = @SED@ |
170 | SET_MAKE = @SET_MAKE@ | 175 | SET_MAKE = @SET_MAKE@ |
diff --git a/libraries/embryo/src/bin/Makefile.in b/libraries/embryo/src/bin/Makefile.in index a6551be..4eaa4b2 100644 --- a/libraries/embryo/src/bin/Makefile.in +++ b/libraries/embryo/src/bin/Makefile.in | |||
@@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||
41 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | 41 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ |
42 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ | 42 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ |
43 | $(top_srcdir)/m4/efl_fnmatch.m4 \ | 43 | $(top_srcdir)/m4/efl_fnmatch.m4 \ |
44 | $(top_srcdir)/m4/efl_gettimeofday.m4 \ | ||
44 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ | 45 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ |
45 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | 46 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
46 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | 47 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
@@ -138,6 +139,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ | |||
138 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 139 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
139 | EVIL_LIBS = @EVIL_LIBS@ | 140 | EVIL_LIBS = @EVIL_LIBS@ |
140 | EXEEXT = @EXEEXT@ | 141 | EXEEXT = @EXEEXT@ |
142 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
143 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
141 | FGREP = @FGREP@ | 144 | FGREP = @FGREP@ |
142 | GREP = @GREP@ | 145 | GREP = @GREP@ |
143 | INSTALL = @INSTALL@ | 146 | INSTALL = @INSTALL@ |
@@ -170,6 +173,8 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
170 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 173 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
171 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 174 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
172 | PKG_CONFIG = @PKG_CONFIG@ | 175 | PKG_CONFIG = @PKG_CONFIG@ |
176 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
177 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
173 | RANLIB = @RANLIB@ | 178 | RANLIB = @RANLIB@ |
174 | SED = @SED@ | 179 | SED = @SED@ |
175 | SET_MAKE = @SET_MAKE@ | 180 | SET_MAKE = @SET_MAKE@ |
diff --git a/libraries/embryo/src/bin/embryo_cc_sc5.scp b/libraries/embryo/src/bin/embryo_cc_sc5.scp index 8005f79..af3f352 100644 --- a/libraries/embryo/src/bin/embryo_cc_sc5.scp +++ b/libraries/embryo/src/bin/embryo_cc_sc5.scp | |||
@@ -18,7 +18,7 @@ | |||
18 | * misrepresented as being the original software. | 18 | * misrepresented as being the original software. |
19 | * 3. This notice may not be removed or altered from any source distribution. | 19 | * 3. This notice may not be removed or altered from any source distribution. |
20 | * | 20 | * |
21 | * Version: $Id: embryo_cc_sc5.scp 14177 2005-04-13 19:37:01Z tsauerbeck $ | 21 | * Version: $Id: embryo_cc_sc5.scp 35497 2008-08-17 07:44:18Z raster $ |
22 | */ | 22 | */ |
23 | 23 | ||
24 | int strexpand(char *dest, unsigned char *source, int maxlen, | 24 | int strexpand(char *dest, unsigned char *source, int maxlen, |
diff --git a/libraries/embryo/src/bin/embryo_cc_sc7.scp b/libraries/embryo/src/bin/embryo_cc_sc7.scp index 83d49a1..15c80ac 100644 --- a/libraries/embryo/src/bin/embryo_cc_sc7.scp +++ b/libraries/embryo/src/bin/embryo_cc_sc7.scp | |||
@@ -19,7 +19,7 @@ | |||
19 | * misrepresented as being the original software. | 19 | * misrepresented as being the original software. |
20 | * 3. This notice may not be removed or altered from any source distribution. | 20 | * 3. This notice may not be removed or altered from any source distribution. |
21 | * | 21 | * |
22 | * Version: $Id: embryo_cc_sc7.scp 14177 2005-04-13 19:37:01Z tsauerbeck $ | 22 | * Version: $Id: embryo_cc_sc7.scp 35497 2008-08-17 07:44:18Z raster $ |
23 | */ | 23 | */ |
24 | 24 | ||
25 | int strexpand(char *dest, unsigned char *source, int maxlen, | 25 | int strexpand(char *dest, unsigned char *source, int maxlen, |
diff --git a/libraries/embryo/src/lib/Embryo.h b/libraries/embryo/src/lib/Embryo.h index 74c872b..4003f6b 100644 --- a/libraries/embryo/src/lib/Embryo.h +++ b/libraries/embryo/src/lib/Embryo.h | |||
@@ -10,7 +10,7 @@ These routines are used for Embryo. | |||
10 | @version 1.0.0 | 10 | @version 1.0.0 |
11 | @author Carsten Haitzler <raster\@rasterman.com> | 11 | @author Carsten Haitzler <raster\@rasterman.com> |
12 | @author Compuphase http://www.compuphase.com | 12 | @author Compuphase http://www.compuphase.com |
13 | @date 2004-2011 | 13 | @date 2004-2012 |
14 | 14 | ||
15 | @section intro What is Embryo? | 15 | @section intro What is Embryo? |
16 | 16 | ||
diff --git a/libraries/embryo/src/lib/Makefile.am b/libraries/embryo/src/lib/Makefile.am index f5c78aa..d2ccb55 100644 --- a/libraries/embryo/src/lib/Makefile.am +++ b/libraries/embryo/src/lib/Makefile.am | |||
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \ | |||
11 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ | 11 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ |
12 | -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ | 12 | -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ |
13 | @EVIL_CFLAGS@ \ | 13 | @EVIL_CFLAGS@ \ |
14 | @EXOTIC_CFLAGS@ \ | ||
14 | @EMBRYO_CPPFLAGS@ \ | 15 | @EMBRYO_CPPFLAGS@ \ |
15 | @EFL_EMBRYO_BUILD@ | 16 | @EFL_EMBRYO_BUILD@ |
16 | 17 | ||
@@ -29,7 +30,7 @@ embryo_str.c \ | |||
29 | embryo_time.c | 30 | embryo_time.c |
30 | 31 | ||
31 | libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ | 32 | libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ |
32 | libembryo_la_LIBADD = @EVIL_LIBS@ -lm | 33 | libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm |
33 | libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ | 34 | libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ |
34 | 35 | ||
35 | EXTRA_DIST = embryo_private.h | 36 | EXTRA_DIST = embryo_private.h |
diff --git a/libraries/embryo/src/lib/Makefile.in b/libraries/embryo/src/lib/Makefile.in index 3fb5591..c46a03e 100644 --- a/libraries/embryo/src/lib/Makefile.in +++ b/libraries/embryo/src/lib/Makefile.in | |||
@@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |||
42 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | 42 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ |
43 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ | 43 | $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \ |
44 | $(top_srcdir)/m4/efl_fnmatch.m4 \ | 44 | $(top_srcdir)/m4/efl_fnmatch.m4 \ |
45 | $(top_srcdir)/m4/efl_gettimeofday.m4 \ | ||
45 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ | 46 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \ |
46 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | 47 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
47 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | 48 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
@@ -154,6 +155,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@ | |||
154 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 155 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
155 | EVIL_LIBS = @EVIL_LIBS@ | 156 | EVIL_LIBS = @EVIL_LIBS@ |
156 | EXEEXT = @EXEEXT@ | 157 | EXEEXT = @EXEEXT@ |
158 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
159 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
157 | FGREP = @FGREP@ | 160 | FGREP = @FGREP@ |
158 | GREP = @GREP@ | 161 | GREP = @GREP@ |
159 | INSTALL = @INSTALL@ | 162 | INSTALL = @INSTALL@ |
@@ -186,6 +189,8 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
186 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 189 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
187 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 190 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
188 | PKG_CONFIG = @PKG_CONFIG@ | 191 | PKG_CONFIG = @PKG_CONFIG@ |
192 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
193 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
189 | RANLIB = @RANLIB@ | 194 | RANLIB = @RANLIB@ |
190 | SED = @SED@ | 195 | SED = @SED@ |
191 | SET_MAKE = @SET_MAKE@ | 196 | SET_MAKE = @SET_MAKE@ |
@@ -264,6 +269,7 @@ AM_CPPFLAGS = \ | |||
264 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ | 269 | -DPACKAGE_LIB_DIR=\"$(libdir)\" \ |
265 | -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ | 270 | -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ |
266 | @EVIL_CFLAGS@ \ | 271 | @EVIL_CFLAGS@ \ |
272 | @EXOTIC_CFLAGS@ \ | ||
267 | @EMBRYO_CPPFLAGS@ \ | 273 | @EMBRYO_CPPFLAGS@ \ |
268 | @EFL_EMBRYO_BUILD@ | 274 | @EFL_EMBRYO_BUILD@ |
269 | 275 | ||
@@ -280,7 +286,7 @@ embryo_str.c \ | |||
280 | embryo_time.c | 286 | embryo_time.c |
281 | 287 | ||
282 | libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ | 288 | libembryo_la_CFLAGS = @EMBRYO_CFLAGS@ |
283 | libembryo_la_LIBADD = @EVIL_LIBS@ -lm | 289 | libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm |
284 | libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ | 290 | libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ |
285 | EXTRA_DIST = embryo_private.h | 291 | EXTRA_DIST = embryo_private.h |
286 | all: all-am | 292 | all: all-am |
diff --git a/libraries/embryo/src/lib/embryo_amx.c b/libraries/embryo/src/lib/embryo_amx.c index 4fa84c5..7a41111 100644 --- a/libraries/embryo/src/lib/embryo_amx.c +++ b/libraries/embryo/src/lib/embryo_amx.c | |||
@@ -29,6 +29,10 @@ | |||
29 | #include <stdio.h> | 29 | #include <stdio.h> |
30 | #include <string.h> | 30 | #include <string.h> |
31 | 31 | ||
32 | #ifdef HAVE_EXOTIC | ||
33 | # include <Exotic.h> | ||
34 | #endif | ||
35 | |||
32 | #include "Embryo.h" | 36 | #include "Embryo.h" |
33 | #include "embryo_private.h" | 37 | #include "embryo_private.h" |
34 | 38 | ||
diff --git a/libraries/embryo/src/lib/embryo_str.c b/libraries/embryo/src/lib/embryo_str.c index 46a3284..0c2faa2 100644 --- a/libraries/embryo/src/lib/embryo_str.c +++ b/libraries/embryo/src/lib/embryo_str.c | |||
@@ -2,28 +2,41 @@ | |||
2 | # include "config.h" | 2 | # include "config.h" |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #include <stdlib.h> | 5 | #ifdef STDC_HEADERS |
6 | #include <stdio.h> | 6 | # include <stdlib.h> |
7 | #include <string.h> | 7 | # include <stddef.h> |
8 | #include <fnmatch.h> | 8 | #else |
9 | 9 | # ifdef HAVE_STDLIB_H | |
10 | # include <stdlib.h> | ||
11 | # endif | ||
12 | #endif | ||
10 | #ifdef HAVE_ALLOCA_H | 13 | #ifdef HAVE_ALLOCA_H |
11 | # include <alloca.h> | 14 | # include <alloca.h> |
12 | #elif defined __GNUC__ | 15 | #elif !defined alloca |
13 | # define alloca __builtin_alloca | 16 | # ifdef __GNUC__ |
14 | #elif defined _AIX | 17 | # define alloca __builtin_alloca |
15 | # define alloca __alloca | 18 | # elif defined _AIX |
16 | #elif defined _MSC_VER | 19 | # define alloca __alloca |
17 | # include <malloc.h> | 20 | # elif defined _MSC_VER |
18 | # define alloca _alloca | 21 | # include <malloc.h> |
19 | #else | 22 | # define alloca _alloca |
20 | # include <stddef.h> | 23 | # elif !defined HAVE_ALLOCA |
21 | # ifdef __cplusplus | 24 | # ifdef __cplusplus |
22 | extern "C" | 25 | extern "C" |
23 | # endif | 26 | # endif |
24 | void *alloca (size_t); | 27 | void *alloca (size_t); |
28 | # endif | ||
29 | #endif | ||
30 | |||
31 | #ifdef HAVE_EXOTIC | ||
32 | # include <Exotic.h> | ||
25 | #endif | 33 | #endif |
26 | 34 | ||
35 | #include <stdlib.h> | ||
36 | #include <stdio.h> | ||
37 | #include <string.h> | ||
38 | #include <fnmatch.h> | ||
39 | |||
27 | #include "Embryo.h" | 40 | #include "Embryo.h" |
28 | #include "embryo_private.h" | 41 | #include "embryo_private.h" |
29 | 42 | ||
diff --git a/libraries/embryo/src/lib/embryo_time.c b/libraries/embryo/src/lib/embryo_time.c index 8392ec3..90c14cf 100644 --- a/libraries/embryo/src/lib/embryo_time.c +++ b/libraries/embryo/src/lib/embryo_time.c | |||
@@ -2,7 +2,7 @@ | |||
2 | # include "config.h" | 2 | # include "config.h" |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #ifndef HAVE_GETTIMEOFDAY | 5 | #ifndef EFL_HAVE_GETTIMEOFDAY |
6 | # error "Your platform isn't supported yet" | 6 | # error "Your platform isn't supported yet" |
7 | #endif | 7 | #endif |
8 | 8 | ||
@@ -17,6 +17,10 @@ | |||
17 | # include <Evil.h> | 17 | # include <Evil.h> |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #ifdef HAVE_EXOTIC | ||
21 | # include <Exotic.h> | ||
22 | #endif | ||
23 | |||
20 | #include "Embryo.h" | 24 | #include "Embryo.h" |
21 | #include "embryo_private.h" | 25 | #include "embryo_private.h" |
22 | 26 | ||