summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-02-03 19:57:27 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-02-03 19:57:27 +0000
commitccb44ec8ce3a499c806b1fd141b0a4d866abf3c5 (patch)
treec92b14429dd4638b6423df0bfa3fe73581942617
parent7d611b2482f89a9f1fd3f5a5e69195886985311d (diff)
put visual studio files outside the libraries directory
SVN revision: 56692
-rw-r--r--win32/MANIFEST.txt18
-rw-r--r--win32/README.txt10
-rw-r--r--win32/common/eina_config.h49
-rw-r--r--win32/patch/eina.diff952
-rw-r--r--win32/start.bat74
-rw-r--r--win32/vs8/eina.sln20
-rw-r--r--win32/vs8/libeina.vcproj519
-rw-r--r--win32/vs9/eina.sln20
-rw-r--r--win32/vs9/libeina.vcproj529
9 files changed, 0 insertions, 2191 deletions
diff --git a/win32/MANIFEST.txt b/win32/MANIFEST.txt
deleted file mode 100644
index 618718f..0000000
--- a/win32/MANIFEST.txt
+++ /dev/null
@@ -1,18 +0,0 @@
1
2 This folder content:
3
4 common - common sources necessary to build efl with MSVC
5
6 eina_config.h - header to configure Eina
7
8 vs8 - Visual Studio 8 project files
9 evil.sln - Eina MSVC solution
10 libeina.vcproj - libeina project
11
12 vs9 - Visual Studio 9 project files
13 evil.sln - Eina MSVC solution
14 libeina.vcproj - libeina project
15
16 start.bat - batch script to start work with the solution
17 MANIFEST.txt - this file
18 README.txt - about this folder
diff --git a/win32/README.txt b/win32/README.txt
deleted file mode 100644
index 398795e..0000000
--- a/win32/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
1 This folder contains Microsoft Visual Studio projects and some sources for
2 building Eina.
3
4Important:
5
6 Do not launch manually any solutions or projects in the folder, to start
7 a solution run the start.bat script, it will setup environment for
8 projects and will check system requirements. start.bat will detect
9 automatically the version of Visual Studio which is installed. It
10 currently supports Visual Studio 2005 and 2008.
diff --git a/win32/common/eina_config.h b/win32/common/eina_config.h
deleted file mode 100644
index be1a50c..0000000
--- a/win32/common/eina_config.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/* EINA - EFL data type library
2 * Copyright (C) 2008 Cedric Bail
3 *
4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version.
8 *
9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details.
13 *
14 * You should have received a copy of the GNU Lesser General Public
15 * License along with this library;
16 * if not, see <http://www.gnu.org/licenses/>.
17 */
18
19#ifndef EINA_CONFIG_H_
20#define EINA_CONFIG_H_
21
22#undef EINA_MAGIC_DEBUG
23#undef EINA_DEFAULT_MEMPOOL
24#undef EINA_SAFETY_CHECKS
25
26#ifndef NDEBUG
27# define EINA_MAGIC_DEBUG
28# define EINA_SAFETY_CHECKS
29#endif
30
31#define NVALGRIND
32
33#ifndef VMAJ
34# define VMAJ 1
35#endif
36#ifndef VMIN
37# define VMIN 0
38#endif
39#ifndef VMIC
40# define VMIC 0
41#endif
42#ifndef VREV
43# define VREV 0
44#endif
45
46#define MODULE_ARCH "win32-msc-x86"
47#define SHARED_LIB_SUFFIX ".dll"
48
49#endif /* EINA_CONFIG_H_ */
diff --git a/win32/patch/eina.diff b/win32/patch/eina.diff
deleted file mode 100644
index b68fbf4..0000000
--- a/win32/patch/eina.diff
+++ /dev/null
@@ -1,952 +0,0 @@
1--- ../../src/lib/eina_array.c 2010-04-15 06:29:24 +0000
2+++ ../../src/lib/eina_array_new.c 2010-04-15 06:32:11 +0000
3@@ -144,21 +144,39 @@
4 EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY); \
5 } while (0)
6
7-#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, ...) \
8+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d) \
9 do { \
10 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR)) \
11 { \
12 EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR); \
13- return __VA_ARGS__; \
14+ return; \
15 } \
16 } while (0)
17
18-#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, ...) \
19+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(d,ret) \
20+ do { \
21+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR)) \
22+ { \
23+ EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR); \
24+ return ret; \
25+ } \
26+ } while (0)
27+
28+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d) \
29+ do { \
30+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR)) \
31+ { \
32+ EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR); \
33+ return; \
34+ } \
35+ } while (0)
36+
37+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(d,ret) \
38 do { \
39 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR)) \
40 { \
41 EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR); \
42- return __VA_ARGS__; \
43+ return ret; \
44 } \
45 } while (0)
46
47@@ -205,7 +223,7 @@
48 static Eina_Bool
49 eina_array_iterator_next(Eina_Iterator_Array *it, void **data)
50 {
51- EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, EINA_FALSE);
52+ EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, EINA_FALSE);
53
54 if (!(it->index < eina_array_count_get(it->array)))
55 return EINA_FALSE;
56@@ -218,7 +236,7 @@
57 static Eina_Array *
58 eina_array_iterator_get_container(Eina_Iterator_Array *it)
59 {
60- EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, NULL);
61+ EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, NULL);
62 return (Eina_Array *) it->array;
63 }
64
65@@ -232,7 +250,7 @@
66 static Eina_Bool
67 eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int idx, void **data)
68 {
69- EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE);
70+ EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, EINA_FALSE);
71
72 if (!(idx < eina_array_count_get(it->array)))
73 return EINA_FALSE;
74@@ -244,7 +262,7 @@
75 static Eina_Array *
76 eina_array_accessor_get_container(Eina_Accessor_Array *it)
77 {
78- EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, NULL);
79+ EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, NULL);
80 return (Eina_Array *) it->array;
81 }
82
83--- ../../src/lib/eina_hash.c 2010-04-15 06:11:15 +0000
84+++ ../../src/lib/eina_hash_new.c 2010-04-14 16:59:57 +0000
85@@ -53,12 +53,21 @@
86 EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH); \
87 } while(0)
88
89-#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, ...) \
90+#define EINA_MAGIC_CHECK_HASH_ITERATOR(d) \
91 do { \
92 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR)) \
93 { \
94 EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
95- return __VA_ARGS__; \
96+ return; \
97+ } \
98+ } while(0)
99+
100+#define EINA_MAGIC_CHECK_HASH_ITERATOR_RET(d, ret) \
101+ do { \
102+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR)) \
103+ { \
104+ EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
105+ return ret; \
106 } \
107 } while(0)
108
109@@ -484,7 +493,7 @@
110 {
111 Eina_Hash_El *stuff;
112
113- EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
114+ EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
115
116 stuff = it->el;
117
118@@ -497,7 +506,7 @@
119 {
120 Eina_Hash_El *stuff;
121
122- EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
123+ EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
124
125 stuff = it->el;
126
127@@ -510,7 +519,7 @@
128 {
129 Eina_Hash_El *stuff;
130
131- EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
132+ EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
133
134 stuff = it->el;
135
136@@ -588,7 +597,7 @@
137 static void *
138 _eina_hash_iterator_get_container(Eina_Iterator_Hash *it)
139 {
140- EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
141+ EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
142 return (void *) it->hash;
143 }
144
145--- ../../src/lib/eina_list.c 2010-04-15 06:29:24 +0000
146+++ ../../src/lib/eina_list_new.c 2010-04-15 06:33:11 +0000
147@@ -98,30 +98,57 @@
148 static const char EINA_MAGIC_LIST_ACCOUNTING_STR[] = "Eina List Accounting";
149
150
151-#define EINA_MAGIC_CHECK_LIST(d, ...) \
152+#define EINA_MAGIC_CHECK_LIST(d) \
153 do { \
154 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST)) \
155 { \
156 EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST); \
157- return __VA_ARGS__; \
158+ return; \
159+ } \
160+ } while(0)
161+
162+#define EINA_MAGIC_CHECK_LIST_RETURN(d,ret) \
163+ do { \
164+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST)) \
165+ { \
166+ EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST); \
167+ return ret; \
168+ } \
169+ } while(0)
170+
171+#define EINA_MAGIC_CHECK_LIST_ITERATOR(d) \
172+ do { \
173+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR)) \
174+ { \
175+ EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR); \
176+ return; \
177 } \
178 } while(0)
179
180-#define EINA_MAGIC_CHECK_LIST_ITERATOR(d, ...) \
181+#define EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(d,ret) \
182 do { \
183 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR)) \
184 { \
185 EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR); \
186- return __VA_ARGS__; \
187+ return ret; \
188+ } \
189+ } while(0)
190+
191+#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d) \
192+ do { \
193+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR)) \
194+ { \
195+ EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR); \
196+ return; \
197 } \
198 } while(0)
199
200-#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d, ...) \
201+#define EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(d,ret) \
202 do { \
203 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR)) \
204 { \
205 EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR); \
206- return __VA_ARGS__; \
207+ return ret; \
208 } \
209 } while(0)
210
211@@ -224,7 +251,7 @@
212 static Eina_List *
213 _eina_list_setup_accounting(Eina_List *list)
214 {
215- EINA_MAGIC_CHECK_LIST(list, NULL);
216+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
217
218 list->accounting = _eina_list_mempool_accounting_new(list);
219 if (!list->accounting) goto on_error;
220@@ -267,7 +294,7 @@
221 static Eina_Bool
222 eina_list_iterator_next(Eina_Iterator_List *it, void **data)
223 {
224- EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
225+ EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);
226
227 if (it->current == NULL) return EINA_FALSE;
228 *data = eina_list_data_get(it->current);
229@@ -280,7 +307,7 @@
230 static Eina_Bool
231 eina_list_iterator_prev(Eina_Iterator_List *it, void **data)
232 {
233- EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
234+ EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);
235
236 if (it->current == NULL) return EINA_FALSE;
237 *data = eina_list_data_get(it->current);
238@@ -293,7 +320,7 @@
239 static Eina_List *
240 eina_list_iterator_get_container(Eina_Iterator_List *it)
241 {
242- EINA_MAGIC_CHECK_LIST_ITERATOR(it, NULL);
243+ EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, NULL);
244
245 return (Eina_List *) it->head;
246 }
247@@ -313,7 +340,7 @@
248 unsigned int middle;
249 unsigned int i;
250
251- EINA_MAGIC_CHECK_LIST_ACCESSOR(it, EINA_FALSE);
252+ EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, EINA_FALSE);
253
254 if (idx >= eina_list_count(it->head)) return EINA_FALSE;
255
256@@ -378,7 +405,7 @@
257 static Eina_List *
258 eina_list_accessor_get_container(Eina_Accessor_List *it)
259 {
260- EINA_MAGIC_CHECK_LIST_ACCESSOR(it, NULL);
261+ EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, NULL);
262
263 return (Eina_List *) it->head;
264 }
265@@ -396,7 +423,7 @@
266 {
267 Eina_List *prev = NULL;
268
269- EINA_MAGIC_CHECK_LIST(list, NULL);
270+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
271
272 for (; list; list = list->next)
273 {
274@@ -582,7 +609,7 @@
275 return _eina_list_setup_accounting(new_l);
276 }
277
278- EINA_MAGIC_CHECK_LIST(list, NULL);
279+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
280
281 l = list->accounting->last;
282 list->accounting->last = new_l;
283@@ -637,7 +664,7 @@
284
285 if (!list) return _eina_list_setup_accounting(new_l);
286
287- EINA_MAGIC_CHECK_LIST(list, NULL);
288+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
289
290 list->prev = new_l;
291
292@@ -690,7 +717,7 @@
293 Eina_List *l;
294 void *list_data;
295
296- if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
297+ if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
298
299 EINA_LIST_FOREACH(list, l, list_data)
300 {
301@@ -728,7 +755,7 @@
302 new_l = _eina_list_mempool_list_new(list);
303 if (!new_l) return list;
304
305- EINA_MAGIC_CHECK_LIST(relative, NULL);
306+ EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);
307 new_l->next = relative->next;
308 new_l->data = (void *)data;
309
310@@ -790,7 +817,7 @@
311 Eina_List *l;
312 void *list_data;
313
314- if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
315+ if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
316
317 EINA_LIST_FOREACH(list, l, list_data)
318 {
319@@ -827,7 +854,7 @@
320 new_l = _eina_list_mempool_list_new(list);
321 if (!new_l) return list;
322
323- EINA_MAGIC_CHECK_LIST(relative, NULL);
324+ EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);
325
326 new_l->prev = relative->prev;
327 new_l->next = relative;
328@@ -899,7 +926,7 @@
329 {
330 Eina_List *l;
331
332- if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
333+ if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
334
335 l = eina_list_data_find_list(list, data);
336 return eina_list_remove_list(list, l);
337@@ -946,7 +973,7 @@
338 if (!list) return NULL;
339 if (!remove_list) return list;
340
341- EINA_MAGIC_CHECK_LIST(remove_list, NULL);
342+ EINA_MAGIC_CHECK_LIST_RETURN(remove_list, NULL);
343
344 if (remove_list->next) remove_list->next->prev = remove_list->prev;
345 if (remove_list->prev)
346@@ -958,7 +985,7 @@
347 return_l = remove_list->next;
348 if (remove_list == remove_list->accounting->last)
349 {
350- EINA_MAGIC_CHECK_LIST(list, NULL);
351+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
352 list->accounting->last = remove_list->prev;
353 }
354 _eina_list_mempool_list_free(remove_list);
355@@ -981,7 +1008,7 @@
356
357 if (!list) return NULL;
358
359- EINA_MAGIC_CHECK_LIST(list, NULL);
360+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
361
362 for (l = list; l;)
363 {
364@@ -1032,8 +1059,8 @@
365 if (move_list == list) return list;
366 if (move_list->next == list) return move_list;
367
368- EINA_MAGIC_CHECK_LIST(list, NULL);
369- EINA_MAGIC_CHECK_LIST(move_list, NULL);
370+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
371+ EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);
372
373 /* Remove the promoted item from the list. */
374 if (!move_list->prev)
375@@ -1094,8 +1121,8 @@
376 /* Demoting tail to be tail. */
377 if (move_list == list->accounting->last) return list;
378
379- EINA_MAGIC_CHECK_LIST(list, NULL);
380- EINA_MAGIC_CHECK_LIST(move_list, NULL);
381+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
382+ EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);
383
384 /* Update pointer list if necessary. */
385 if (list == move_list)
386@@ -1160,7 +1187,7 @@
387 const Eina_List *l;
388 void *list_data;
389
390- if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
391+ if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
392
393 EINA_LIST_FOREACH(list, l, list_data)
394 {
395@@ -1211,7 +1238,7 @@
396 const Eina_List *l;
397 unsigned int i;
398
399- if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
400+ if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
401
402 /* check for non-existing nodes */
403 if ((!list) || (n > (list->accounting->count - 1)))
404@@ -1328,7 +1355,7 @@
405
406 if (!list) return NULL;
407
408- EINA_MAGIC_CHECK_LIST(list, NULL);
409+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
410
411 l1 = list;
412 l2 = list->accounting->last;
413@@ -1372,7 +1399,7 @@
414
415 if (!list) return NULL;
416
417- EINA_MAGIC_CHECK_LIST(list, NULL);
418+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
419
420 lclone = NULL;
421 EINA_LIST_FOREACH(list, l, data)
422@@ -1405,7 +1432,7 @@
423
424 if (!list) return NULL;
425
426- EINA_MAGIC_CHECK_LIST(list, NULL);
427+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
428
429 lclone = NULL;
430 EINA_LIST_FOREACH(list, l, data)
431@@ -1466,7 +1493,7 @@
432
433 EINA_SAFETY_ON_NULL_RETURN_VAL(func, list);
434 if (!list) return NULL;
435- EINA_MAGIC_CHECK_LIST(list, NULL);
436+ EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
437
438 /* if the caller specified an invalid size, sort the whole list */
439 if ((size == 0) ||
440--- ../../src/lib/eina_matrixsparse.c 2010-04-15 06:29:24 +0000
441+++ ../../src/lib/eina_matrixsparse_new.c 2010-04-15 06:33:48 +0000
442@@ -66,12 +66,21 @@
443 static const char EINA_MAGIC_MATRIXSPARSE_CELL_ITERATOR_STR[] = "Eina Matrixsparse Cell Iterator";
444
445
446-#define EINA_MAGIC_CHECK_MATRIXSPARSE(d, ...) \
447+#define EINA_MAGIC_CHECK_MATRIXSPARSE(d) \
448 do { \
449 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE)) \
450 { \
451 EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE); \
452- return __VA_ARGS__; \
453+ return; \
454+ } \
455+ } while(0)
456+
457+#define EINA_MAGIC_CHECK_MATRIXSPARSE_RET(d, ret) \
458+ do { \
459+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE)) \
460+ { \
461+ EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE); \
462+ return ret; \
463 } \
464 } while(0)
465
466@@ -93,12 +102,21 @@
467 } \
468 } while(0)
469
470-#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d, ...) \
471+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d) \
472+ do { \
473+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR)) \
474+ { \
475+ EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR); \
476+ return; \
477+ } \
478+ } while(0)
479+
480+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(d, ret) \
481 do { \
482 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR)) \
483 { \
484 EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR); \
485- return __VA_ARGS__; \
486+ return ret; \
487 } \
488 } while(0)
489
490@@ -663,7 +681,7 @@
491 static Eina_Bool
492 _eina_matrixsparse_iterator_next(Eina_Matrixsparse_Iterator *it, void **data)
493 {
494- EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
495+ EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
496
497 /* do not touch it->idx */
498
499@@ -683,7 +701,7 @@
500 static Eina_Matrixsparse *
501 _eina_matrixsparse_iterator_get_container(Eina_Matrixsparse_Iterator *it)
502 {
503- EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
504+ EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
505 return (Eina_Matrixsparse *)it->m;
506 }
507
508@@ -699,7 +717,7 @@
509 static Eina_Bool
510 _eina_matrixsparse_iterator_complete_next(Eina_Matrixsparse_Iterator_Complete *it, void **data)
511 {
512- EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
513+ EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
514
515 if (it->idx.row >= it->m->size.rows)
516 return 0;
517@@ -740,7 +758,7 @@
518 static Eina_Matrixsparse *
519 _eina_matrixsparse_iterator_complete_get_container(Eina_Matrixsparse_Iterator_Complete *it)
520 {
521- EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
522+ EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
523 return (Eina_Matrixsparse *)it->m;
524 }
525
526@@ -993,7 +1011,7 @@
527 void (*free_func)(void *, void *);
528 void *user_data;
529
530- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
531+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
532 EINA_SAFETY_ON_FALSE_RETURN_VAL(rows > 0, 0);
533 EINA_SAFETY_ON_FALSE_RETURN_VAL(cols > 0, 0);
534
535@@ -1100,7 +1118,7 @@
536 EAPI Eina_Bool
537 eina_matrixsparse_cell_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col, Eina_Matrixsparse_Cell **cell)
538 {
539- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
540+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
541 EINA_SAFETY_ON_NULL_RETURN_VAL(cell, 0);
542 *cell = NULL;
543 EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
544@@ -1142,7 +1160,7 @@
545 eina_matrixsparse_data_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col)
546 {
547 Eina_Matrixsparse_Cell *c;
548- EINA_MAGIC_CHECK_MATRIXSPARSE(m, NULL);
549+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, NULL);
550 c = _eina_matrixsparse_cell_idx_get(m, row, col);
551 if (c) return c->data;
552 else return NULL;
553@@ -1213,7 +1231,7 @@
554
555 EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
556 EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
557- EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
558+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
559
560 m = cell->parent->parent;
561
562@@ -1245,7 +1263,7 @@
563 Eina_Matrixsparse_Cell *cell;
564
565 if (p_old) *p_old = NULL;
566- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
567+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
568 EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
569 EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
570
571@@ -1281,7 +1299,7 @@
572 {
573 Eina_Matrixsparse_Cell *cell;
574
575- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
576+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
577 EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
578 EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
579
580@@ -1319,7 +1337,7 @@
581 {
582 Eina_Matrixsparse_Row *r;
583
584- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
585+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
586 EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
587
588 r = _eina_matrixsparse_row_idx_get(m, row);
589@@ -1355,7 +1373,7 @@
590 void (*free_func)(void *, void *);
591 void *user_data;
592
593- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
594+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
595 EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
596
597 free_func = m->free.func;
598@@ -1410,7 +1428,7 @@
599 {
600 Eina_Matrixsparse_Cell *c;
601
602- EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
603+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
604 EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
605 EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
606
607@@ -1442,7 +1460,7 @@
608
609 EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
610 EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
611- EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
612+ EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
613
614 m = cell->parent->parent;
615
616--- ../../src/lib/eina_strbuf.c 2010-04-15 06:17:34 +0000
617+++ ../../src/lib/eina_strbuf_new.c 2010-04-15 06:47:16 +0000
618@@ -33,12 +33,21 @@
619
620 static const char EINA_MAGIC_STRBUF_STR[] = "Eina Strbuf";
621
622-#define EINA_MAGIC_CHECK_STRBUF(d, ...) \
623+#define EINA_MAGIC_CHECK_STRBUF(d) \
624 do { \
625 if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF)) \
626 { \
627 EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF); \
628- return __VA_ARGS__; \
629+ return; \
630+ } \
631+ } while (0)
632+
633+#define EINA_MAGIC_CHECK_STRBUF_RET(d, ret) \
634+ do { \
635+ if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF)) \
636+ { \
637+ EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF); \
638+ return ret; \
639 } \
640 } while (0)
641
642@@ -344,7 +353,7 @@
643 size_t len;
644
645 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
646- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
647+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
648
649 len = strlen(str);
650 if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + len)))
651@@ -372,7 +381,7 @@
652 char *esc;
653
654 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
655- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
656+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
657
658 esc = eina_str_escape(str);
659 if (EINA_UNLIKELY(!esc))
660@@ -416,7 +425,7 @@
661 size_t len;
662
663 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
664- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
665+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
666
667 len = strlen(str);
668 if (len > maxlen) len = maxlen;
669@@ -452,7 +461,7 @@
670 eina_strbuf_append_length(Eina_Strbuf *buf, const char *str, size_t length)
671 {
672 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
673- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
674+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
675
676 if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + length)))
677 return EINA_FALSE;
678@@ -481,7 +490,7 @@
679 Eina_Bool ret;
680
681 EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
682- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
683+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
684
685 va_start(args, fmt);
686 len = vasprintf(&str, fmt, args);
687@@ -512,7 +521,7 @@
688 Eina_Bool ret;
689
690 EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
691- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
692+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
693
694 len = vasprintf(&str, fmt, args);
695
696@@ -544,7 +553,7 @@
697 size_t len;
698
699 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
700- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
701+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
702
703 if (pos >= buf->len)
704 return eina_strbuf_append(buf, str);
705@@ -574,7 +583,7 @@
706 char *esc;
707
708 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
709- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
710+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
711
712 esc = eina_str_escape(str);
713 if (EINA_UNLIKELY(!esc))
714@@ -609,7 +618,7 @@
715 size_t len;
716
717 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
718- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
719+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
720
721 if (pos >= buf->len)
722 return eina_strbuf_append_n(buf, str, maxlen);
723@@ -643,7 +652,7 @@
724 eina_strbuf_insert_length(Eina_Strbuf *buf, const char *str, size_t length, size_t pos)
725 {
726 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
727- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
728+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
729
730 if (pos >= buf->len)
731 return eina_strbuf_append_length(buf, str, length);
732@@ -665,7 +674,7 @@
733 EAPI Eina_Bool
734 eina_strbuf_append_char(Eina_Strbuf *buf, char c)
735 {
736- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
737+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
738
739 if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + 1)))
740 return EINA_FALSE;
741@@ -690,7 +699,7 @@
742 EAPI Eina_Bool
743 eina_strbuf_insert_char(Eina_Strbuf *buf, char c, size_t pos)
744 {
745- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
746+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
747
748 if (pos >= buf->len)
749 return eina_strbuf_append_char(buf, c);
750@@ -715,7 +724,7 @@
751 Eina_Bool ret;
752
753 EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
754- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
755+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
756
757 va_start(args, pos);
758 len = vasprintf(&str, fmt, args);
759@@ -745,7 +754,7 @@
760 Eina_Bool ret;
761
762 EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
763- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
764+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
765
766 len = vasprintf(&str, fmt, args);
767
768@@ -776,7 +785,7 @@
769 {
770 size_t remove_len, tail_len;
771
772- EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
773+ EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
774
775 if (end >= buf->len)
776 end = buf->len;
777@@ -813,7 +822,7 @@
778 EAPI const char *
779 eina_strbuf_string_get(const Eina_Strbuf *buf)
780 {
781- EINA_MAGIC_CHECK_STRBUF(buf, NULL);
782+ EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
783
784 return buf->buf;
785 }
786@@ -836,7 +845,7 @@
787 {
788 char *ret;
789
790- EINA_MAGIC_CHECK_STRBUF(buf, NULL);
791+ EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
792
793 ret = buf->buf;
794 // TODO: Check return value and do something clever
795@@ -855,7 +864,7 @@
796 EAPI size_t
797 eina_strbuf_length_get(const Eina_Strbuf *buf)
798 {
799- EINA_MAGIC_CHECK_STRBUF(buf, 0);
800+ EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
801
802 return buf->len;
803 }
804@@ -881,7 +890,7 @@
805
806 EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
807 EINA_SAFETY_ON_NULL_RETURN_VAL(with, EINA_FALSE);
808- EINA_MAGIC_CHECK_STRBUF(buf, 0);
809+ EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
810
811 if (n == 0)
812 return EINA_FALSE;
813@@ -939,7 +948,7 @@
814
815 EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0);
816 EINA_SAFETY_ON_NULL_RETURN_VAL(with, 0);
817- EINA_MAGIC_CHECK_STRBUF(buf, 0);
818+ EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
819
820 spos = strstr(buf->buf, str);
821 if (!spos || *spos == '\0')
822--- ../../src/lib/eina_stringshare.c 2010-04-15 06:53:51 +0000
823+++ ../../src/lib/eina_stringshare_new.c 2010-04-15 06:35:44 +0000
824@@ -104,13 +104,23 @@
825 static const char EINA_MAGIC_STRINGSHARE_NODE_STR[] = "Eina Stringshare Node";
826
827
828-#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock, ...) \
829+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock) \
830 do { \
831 if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD)) \
832 { \
833 EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD); \
834 unlock; \
835- return __VA_ARGS__; \
836+ return; \
837+ } \
838+ } while (0)
839+
840+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(d, unlock, ret) \
841+ do { \
842+ if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD)) \
843+ { \
844+ EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD); \
845+ unlock; \
846+ return ret; \
847 } \
848 } while (0)
849
850@@ -371,7 +381,7 @@
851 static int
852 _eina_stringshare_cmp(const Eina_Stringshare_Head *ed, const int *hash, __UNUSED__ int length, __UNUSED__ void *data)
853 {
854- EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, , 0);
855+ EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, , 0);
856
857 return ed->hash - *hash;
858 }
859@@ -379,8 +389,8 @@
860 static Eina_Rbtree_Direction
861 _eina_stringshare_node(const Eina_Stringshare_Head *left, const Eina_Stringshare_Head *right, __UNUSED__ void *data)
862 {
863- EINA_MAGIC_CHECK_STRINGSHARE_HEAD(left, , 0);
864- EINA_MAGIC_CHECK_STRINGSHARE_HEAD(right, , 0);
865+ EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(left, , 0);
866+ EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(right, , 0);
867
868 if (left->hash - right->hash < 0)
869 return EINA_RBTREE_LEFT;
870@@ -1138,7 +1148,7 @@
871 return s;
872 }
873
874- EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, STRINGSHARE_UNLOCK_BIG(), NULL);
875+ EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, STRINGSHARE_UNLOCK_BIG(), NULL);
876
877 el = _eina_stringshare_head_find(ed, str, slen);
878 if (el)
879--- ../../src/lib/eina_tiler.c 2010-04-15 06:11:15 +0000
880+++ ../../src/lib/eina_tiler_new.c 2010-04-14 16:50:29 +0000
881@@ -110,22 +110,40 @@
882 splitter_t splitter;
883 };
884
885-#define EINA_MAGIC_CHECK_TILER(d, ...) \
886+#define EINA_MAGIC_CHECK_TILER(d) \
887 do { \
888 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER)) \
889 { \
890 EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER); \
891- return __VA_ARGS__; \
892+ return; \
893 } \
894 } while(0)
895
896+#define EINA_MAGIC_CHECK_TILER_RETURN(d,ret) \
897+ do { \
898+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER)) \
899+ { \
900+ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER); \
901+ return ret; \
902+ } \
903+ } while(0)
904+
905+
906+#define EINA_MAGIC_CHECK_TILER_ITERATOR(d) \
907+ do { \
908+ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR)) \
909+ { \
910+ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR); \
911+ return; \
912+ } \
913+ } while(0)
914
915-#define EINA_MAGIC_CHECK_TILER_ITERATOR(d, ...) \
916+#define EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(d,ret) \
917 do { \
918 if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR)) \
919 { \
920 EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR); \
921- return __VA_ARGS__; \
922+ return ret; \
923 } \
924 } while(0)
925
926@@ -1081,7 +1099,7 @@
927
928 static void * _iterator_get_container(Eina_Iterator_Tiler *it)
929 {
930- EINA_MAGIC_CHECK_TILER_ITERATOR(it, NULL);
931+ EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(it, NULL);
932 return (void *)it->tiler;
933 }
934
935@@ -1134,7 +1152,7 @@
936 {
937 Eina_Rectangle tmp;
938
939- EINA_MAGIC_CHECK_TILER(t, EINA_FALSE);
940+ EINA_MAGIC_CHECK_TILER_RETURN(t, EINA_FALSE);
941 if ((r->w <= 0) || (r->h <= 0))
942 return EINA_FALSE;
943 tmp = *r;
944@@ -1171,7 +1189,7 @@
945 {
946 Eina_Iterator_Tiler *it;
947
948- EINA_MAGIC_CHECK_TILER(t, NULL);
949+ EINA_MAGIC_CHECK_TILER_RETURN(t, NULL);
950 it = calloc(1, sizeof (Eina_Iterator_Tiler));
951 if (!it) return NULL;
952
diff --git a/win32/start.bat b/win32/start.bat
deleted file mode 100644
index a717124..0000000
--- a/win32/start.bat
+++ /dev/null
@@ -1,74 +0,0 @@
1@echo off
2
3rem Set external libraries directory.
4set EXT_DIR=%cd%\..\..\..\extern
5
6if not exist %EXT_DIR% (
7 set EXT_DIR=
8 echo ERROR: External libs dir is not set.
9 pause
10 goto END
11)
12
13rem Check for basic requirements for Visual Studio 2008
14if "%VS90COMNTOOLS%" == "" (
15 echo ERROR: Microsoft Visual Studio 2008 is not installed.
16 echo ERROR: Try to launch Microsoft Visual Studio 2005.
17 pause
18 goto NOVS9
19)
20
21set PROJECT_TYPE=vs9
22set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat
23
24goto STARTVS
25
26:NOVS9
27
28rem Check for basic requirements for Visual Studio 2005
29if "%VS80COMNTOOLS%" == "" (
30 echo ERROR: Microsoft Visual Studio 2005 is not installed.
31 pause
32 goto END
33)
34
35set PROJECT_TYPE=vs8
36set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat
37
38rem Patching Eina
39patch.exe --binary -p1 < %cd%\patch\eina.diff
40echo INFO: Eina patched.
41
42pause
43
44:STARTVS
45
46rem Setup common Win32 environment variables
47
48rem Add Evil lib path
49set EvilInclude=%cd%\..\..\evil\src\lib
50set EvilCommon=%cd%\..\..\evil\win32\common
51set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out
52
53set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%
54set LIB=%EvilOut%;%LIB%
55
56rem Add installation directory pathes.
57set INCLUDE=%EXT_DIR%\include;%INCLUDE%
58set LIB=%EXT_DIR%\lib;%LIB%
59
60set INCLUDE=%cd%\common;%cd%\..\src\include;%cd%\..\src\lib;%INCLUDE%
61
62set SolutionDirectory=%cd%\%PROJECT_TYPE%
63set DebugOutputDirectory=%SolutionDirectory%\out
64set ReleaseOutputDirectory=%SolutionDirectory%\out
65set DebugLibraryDirectory=%SolutionDirectory%\out
66set ReleaseLibraryDirectory=%SolutionDirectory%\out
67set TemporaryDirectory=%SolutionDirectory%\temp
68
69rem Setting environment for using Microsoft Visual Studio x86 tools.
70call "%VSCOMMONTOOLS%"
71
72%PROJECT_TYPE%\eina.sln
73
74:END
diff --git a/win32/vs8/eina.sln b/win32/vs8/eina.sln
deleted file mode 100644
index 1051362..0000000
--- a/win32/vs8/eina.sln
+++ /dev/null
@@ -1,20 +0,0 @@
1
2Microsoft Visual Studio Solution File, Format Version 9.00
3# Visual Studio 2005
4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
5EndProject
6Global
7 GlobalSection(SolutionConfigurationPlatforms) = preSolution
8 Debug|Win32 = Debug|Win32
9 Release|Win32 = Release|Win32
10 EndGlobalSection
11 GlobalSection(ProjectConfigurationPlatforms) = postSolution
12 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
13 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
14 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
15 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
16 EndGlobalSection
17 GlobalSection(SolutionProperties) = preSolution
18 HideSolutionNode = FALSE
19 EndGlobalSection
20EndGlobal
diff --git a/win32/vs8/libeina.vcproj b/win32/vs8/libeina.vcproj
deleted file mode 100644
index 560ba47..0000000
--- a/win32/vs8/libeina.vcproj
+++ /dev/null
@@ -1,519 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8,00"
5 Name="libeina"
6 ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
7 RootNamespace="eina"
8 Keyword="Win32Proj"
9 >
10 <Platforms>
11 <Platform
12 Name="Win32"
13 />
14 </Platforms>
15 <ToolFiles>
16 </ToolFiles>
17 <Configurations>
18 <Configuration
19 Name="Debug|Win32"
20 OutputDirectory="$(DebugOutputDirectory)"
21 IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
22 ConfigurationType="2"
23 CharacterSet="0"
24 >
25 <Tool
26 Name="VCPreBuildEventTool"
27 />
28 <Tool
29 Name="VCCustomBuildTool"
30 />
31 <Tool
32 Name="VCXMLDataGeneratorTool"
33 />
34 <Tool
35 Name="VCWebServiceProxyGeneratorTool"
36 />
37 <Tool
38 Name="VCMIDLTool"
39 />
40 <Tool
41 Name="VCCLCompilerTool"
42 Optimization="0"
43 AdditionalIncludeDirectories="$(INCLUDE)"
44 PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
45 MinimalRebuild="true"
46 BasicRuntimeChecks="3"
47 RuntimeLibrary="3"
48 UsePrecompiledHeader="0"
49 WarningLevel="3"
50 Detect64BitPortabilityProblems="true"
51 DebugInformationFormat="4"
52 CompileAs="0"
53 />
54 <Tool
55 Name="VCManagedResourceCompilerTool"
56 />
57 <Tool
58 Name="VCResourceCompilerTool"
59 />
60 <Tool
61 Name="VCPreLinkEventTool"
62 />
63 <Tool
64 Name="VCLinkerTool"
65 IgnoreImportLibrary="false"
66 LinkLibraryDependencies="true"
67 AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
68 OutputFile="$(OutDir)\libeina.dll"
69 LinkIncremental="2"
70 AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
71 GenerateDebugInformation="true"
72 SubSystem="2"
73 TargetMachine="1"
74 />
75 <Tool
76 Name="VCALinkTool"
77 />
78 <Tool
79 Name="VCManifestTool"
80 />
81 <Tool
82 Name="VCXDCMakeTool"
83 />
84 <Tool
85 Name="VCBscMakeTool"
86 />
87 <Tool
88 Name="VCFxCopTool"
89 />
90 <Tool
91 Name="VCAppVerifierTool"
92 />
93 <Tool
94 Name="VCWebDeploymentTool"
95 />
96 <Tool
97 Name="VCPostBuildEventTool"
98 />
99 </Configuration>
100 <Configuration
101 Name="Release|Win32"
102 OutputDirectory="$(ReleaseOutputDirectory)"
103 IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
104 ConfigurationType="2"
105 CharacterSet="0"
106 WholeProgramOptimization="1"
107 >
108 <Tool
109 Name="VCPreBuildEventTool"
110 />
111 <Tool
112 Name="VCCustomBuildTool"
113 />
114 <Tool
115 Name="VCXMLDataGeneratorTool"
116 />
117 <Tool
118 Name="VCWebServiceProxyGeneratorTool"
119 />
120 <Tool
121 Name="VCMIDLTool"
122 />
123 <Tool
124 Name="VCCLCompilerTool"
125 AdditionalIncludeDirectories="$(INCLUDE)"
126 PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
127 RuntimeLibrary="2"
128 UsePrecompiledHeader="0"
129 WarningLevel="3"
130 Detect64BitPortabilityProblems="true"
131 DebugInformationFormat="3"
132 CompileAs="0"
133 />
134 <Tool
135 Name="VCManagedResourceCompilerTool"
136 />
137 <Tool
138 Name="VCResourceCompilerTool"
139 />
140 <Tool
141 Name="VCPreLinkEventTool"
142 />
143 <Tool
144 Name="VCLinkerTool"
145 IgnoreImportLibrary="false"
146 LinkLibraryDependencies="true"
147 AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
148 OutputFile="$(OutDir)\libeina.dll"
149 LinkIncremental="1"
150 AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
151 GenerateDebugInformation="true"
152 SubSystem="2"
153 OptimizeReferences="2"
154 EnableCOMDATFolding="2"
155 TargetMachine="1"
156 />
157 <Tool
158 Name="VCALinkTool"
159 />
160 <Tool
161 Name="VCManifestTool"
162 />
163 <Tool
164 Name="VCXDCMakeTool"
165 />
166 <Tool
167 Name="VCBscMakeTool"
168 />
169 <Tool
170 Name="VCFxCopTool"
171 />
172 <Tool
173 Name="VCAppVerifierTool"
174 />
175 <Tool
176 Name="VCWebDeploymentTool"
177 />
178 <Tool
179 Name="VCPostBuildEventTool"
180 />
181 </Configuration>
182 </Configurations>
183 <References>
184 </References>
185 <Files>
186 <Filter
187 Name="Source Files"
188 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
189 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
190 >
191 <File
192 RelativePath="..\..\src\lib\eina_accessor.c"
193 >
194 </File>
195 <File
196 RelativePath="..\..\src\lib\eina_array.c"
197 >
198 </File>
199 <File
200 RelativePath="..\..\src\lib\eina_benchmark.c"
201 >
202 </File>
203 <File
204 RelativePath="..\..\src\lib\eina_binshare.c"
205 >
206 </File>
207 <File
208 RelativePath="..\..\src\lib\eina_convert.c"
209 >
210 </File>
211 <File
212 RelativePath="..\..\src\lib\eina_counter.c"
213 >
214 </File>
215 <File
216 RelativePath="..\..\src\lib\eina_cpu.c"
217 >
218 </File>
219 <File
220 RelativePath="..\..\src\lib\eina_error.c"
221 >
222 </File>
223 <File
224 RelativePath="..\..\src\lib\eina_file_win32.c"
225 >
226 </File>
227 <File
228 RelativePath="..\..\src\lib\eina_fp.c"
229 >
230 </File>
231 <File
232 RelativePath="..\..\src\lib\eina_hamster.c"
233 >
234 </File>
235 <File
236 RelativePath="..\..\src\lib\eina_hash.c"
237 >
238 </File>
239 <File
240 RelativePath="..\..\src\lib\eina_inlist.c"
241 >
242 </File>
243 <File
244 RelativePath="..\..\src\lib\eina_iterator.c"
245 >
246 </File>
247 <File
248 RelativePath="..\..\src\lib\eina_lalloc.c"
249 >
250 </File>
251 <File
252 RelativePath="..\..\src\lib\eina_list.c"
253 >
254 </File>
255 <File
256 RelativePath="..\..\src\lib\eina_log.c"
257 >
258 </File>
259 <File
260 RelativePath="..\..\src\lib\eina_magic.c"
261 >
262 </File>
263 <File
264 RelativePath="..\..\src\lib\eina_main.c"
265 >
266 </File>
267 <File
268 RelativePath="..\..\src\lib\eina_matrixsparse.c"
269 >
270 </File>
271 <File
272 RelativePath="..\..\src\lib\eina_mempool.c"
273 >
274 </File>
275 <File
276 RelativePath="..\..\src\lib\eina_module.c"
277 >
278 </File>
279 <File
280 RelativePath="..\..\src\lib\eina_quadtree.c"
281 >
282 </File>
283 <File
284 RelativePath="..\..\src\lib\eina_rbtree.c"
285 >
286 </File>
287 <File
288 RelativePath="..\..\src\lib\eina_rectangle.c"
289 >
290 </File>
291 <File
292 RelativePath="..\..\src\lib\eina_safety_checks.c"
293 >
294 </File>
295 <File
296 RelativePath="..\..\src\lib\eina_share_common.c"
297 >
298 </File>
299 <File
300 RelativePath="..\..\src\lib\eina_strbuf.c"
301 >
302 </File>
303 <File
304 RelativePath="..\..\src\lib\eina_strbuf_common.c"
305 >
306 </File>
307 <File
308 RelativePath="..\..\src\lib\eina_str.c"
309 >
310 </File>
311 <File
312 RelativePath="..\..\src\lib\eina_stringshare.c"
313 >
314 </File>
315 <File
316 RelativePath="..\..\src\lib\eina_tiler.c"
317 >
318 </File>
319 <File
320 RelativePath="..\..\src\lib\eina_unicode.c"
321 >
322 </File>
323 <File
324 RelativePath="..\..\src\lib\eina_ustrbuf.c"
325 >
326 </File>
327 <File
328 RelativePath="..\..\src\lib\eina_ustringshare.c"
329 >
330 </File>
331 <File
332 RelativePath="..\..\src\lib\eina_value.c"
333 >
334 </File>
335 <File
336 RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"
337 >
338 </File>
339 <File
340 RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"
341 >
342 </File>
343 <File
344 RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"
345 >
346 </File>
347 <File
348 RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"
349 >
350 </File>
351 </Filter>
352 <Filter
353 Name="Header Files"
354 Filter="h;hpp;hxx;hm;inl;inc;xsd"
355 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
356 >
357 <File
358 RelativePath="..\..\src\include\Eina.h"
359 >
360 </File>
361 <File
362 RelativePath="..\..\src\include\eina_accessor.h"
363 >
364 </File>
365 <File
366 RelativePath="..\..\src\include\eina_array.h"
367 >
368 </File>
369 <File
370 RelativePath="..\..\src\include\eina_benchmark.h"
371 >
372 </File>
373 <File
374 RelativePath="..\..\src\include\eina_binshare.h"
375 >
376 </File>
377 <File
378 RelativePath="..\..\src\include\eina_convert.h"
379 >
380 </File>
381 <File
382 RelativePath="..\..\src\include\eina_counter.h"
383 >
384 </File>
385 <File
386 RelativePath="..\..\src\include\eina_cpu.h"
387 >
388 </File>
389 <File
390 RelativePath="..\..\src\include\eina_error.h"
391 >
392 </File>
393 <File
394 RelativePath="..\..\src\include\eina_file.h"
395 >
396 </File>
397 <File
398 RelativePath="..\..\src\include\eina_fp.h"
399 >
400 </File>
401 <File
402 RelativePath="..\..\src\include\eina_hamster.h"
403 >
404 </File>
405 <File
406 RelativePath="..\..\src\include\eina_hash.h"
407 >
408 </File>
409 <File
410 RelativePath="..\..\src\include\eina_inlist.h"
411 >
412 </File>
413 <File
414 RelativePath="..\..\src\include\eina_iterator.h"
415 >
416 </File>
417 <File
418 RelativePath="..\..\src\include\eina_lalloc.h"
419 >
420 </File>
421 <File
422 RelativePath="..\..\src\include\eina_list.h"
423 >
424 </File>
425 <File
426 RelativePath="..\..\src\include\eina_log.h"
427 >
428 </File>
429 <File
430 RelativePath="..\..\src\include\eina_magic.h"
431 >
432 </File>
433 <File
434 RelativePath="..\..\src\include\eina_main.h"
435 >
436 </File>
437 <File
438 RelativePath="..\..\src\include\eina_matrixsparse.h"
439 >
440 </File>
441 <File
442 RelativePath="..\..\src\include\eina_mempool.h"
443 >
444 </File>
445 <File
446 RelativePath="..\..\src\include\eina_module.h"
447 >
448 </File>
449 <File
450 RelativePath="..\..\src\lib\eina_private.h"
451 >
452 </File>
453 <File
454 RelativePath="..\..\src\include\eina_quadtree.h"
455 >
456 </File>
457 <File
458 RelativePath="..\..\src\include\eina_rbtree.h"
459 >
460 </File>
461 <File
462 RelativePath="..\..\src\include\eina_rectangle.h"
463 >
464 </File>
465 <File
466 RelativePath="..\..\src\include\eina_safety_checks.h"
467 >
468 </File>
469 <File
470 RelativePath="..\..\src\include\eina_strbuf.h"
471 >
472 </File>
473 <File
474 RelativePath="..\..\src\include\eina_strbuf_common.h"
475 >
476 </File>
477 <File
478 RelativePath="..\..\src\include\eina_str.h"
479 >
480 </File>
481 <File
482 RelativePath="..\..\src\include\eina_stringshare.h"
483 >
484 </File>
485 <File
486 RelativePath="..\..\src\include\eina_tiler.h"
487 >
488 </File>
489 <File
490 RelativePath="..\..\src\include\eina_trash.h"
491 >
492 </File>
493 <File
494 RelativePath="..\..\src\include\eina_types.h"
495 >
496 </File>
497 <File
498 RelativePath="..\..\src\include\eina_unicode.h"
499 >
500 </File>
501 <File
502 RelativePath="..\..\src\include\eina_ustrbuf.h"
503 >
504 </File>
505 <File
506 RelativePath="..\..\src\include\eina_ustringshare.h"
507 >
508 </File>
509 </Filter>
510 <Filter
511 Name="Resource Files"
512 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
513 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
514 >
515 </Filter>
516 </Files>
517 <Globals>
518 </Globals>
519</VisualStudioProject>
diff --git a/win32/vs9/eina.sln b/win32/vs9/eina.sln
deleted file mode 100644
index 4ab4a53..0000000
--- a/win32/vs9/eina.sln
+++ /dev/null
@@ -1,20 +0,0 @@
1
2Microsoft Visual Studio Solution File, Format Version 10.00
3# Visual C++ Express 2008
4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
5EndProject
6Global
7 GlobalSection(SolutionConfigurationPlatforms) = preSolution
8 Debug|Win32 = Debug|Win32
9 Release|Win32 = Release|Win32
10 EndGlobalSection
11 GlobalSection(ProjectConfigurationPlatforms) = postSolution
12 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
13 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
14 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
15 {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
16 EndGlobalSection
17 GlobalSection(SolutionProperties) = preSolution
18 HideSolutionNode = FALSE
19 EndGlobalSection
20EndGlobal
diff --git a/win32/vs9/libeina.vcproj b/win32/vs9/libeina.vcproj
deleted file mode 100644
index 24f3d8b..0000000
--- a/win32/vs9/libeina.vcproj
+++ /dev/null
@@ -1,529 +0,0 @@
1<?xml version="1.0" encoding="windows-1251"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9,00"
5 Name="libeina"
6 ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
7 RootNamespace="eina"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 </Platforms>
16 <ToolFiles>
17 </ToolFiles>
18 <Configurations>
19 <Configuration
20 Name="Debug|Win32"
21 OutputDirectory="$(DebugOutputDirectory)"
22 IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
23 ConfigurationType="2"
24 CharacterSet="0"
25 >
26 <Tool
27 Name="VCPreBuildEventTool"
28 />
29 <Tool
30 Name="VCCustomBuildTool"
31 />
32 <Tool
33 Name="VCXMLDataGeneratorTool"
34 />
35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"
37 />
38 <Tool
39 Name="VCMIDLTool"
40 />
41 <Tool
42 Name="VCCLCompilerTool"
43 Optimization="0"
44 AdditionalIncludeDirectories="$(INCLUDE)"
45 PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
46 MinimalRebuild="true"
47 BasicRuntimeChecks="3"
48 RuntimeLibrary="3"
49 UsePrecompiledHeader="0"
50 WarningLevel="3"
51 Detect64BitPortabilityProblems="true"
52 DebugInformationFormat="4"
53 CompileAs="0"
54 />
55 <Tool
56 Name="VCManagedResourceCompilerTool"
57 />
58 <Tool
59 Name="VCResourceCompilerTool"
60 />
61 <Tool
62 Name="VCPreLinkEventTool"
63 />
64 <Tool
65 Name="VCLinkerTool"
66 IgnoreImportLibrary="false"
67 LinkLibraryDependencies="true"
68 AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
69 OutputFile="$(OutDir)\libeina.dll"
70 LinkIncremental="2"
71 AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
72 GenerateDebugInformation="true"
73 SubSystem="2"
74 RandomizedBaseAddress="1"
75 DataExecutionPrevention="0"
76 TargetMachine="1"
77 />
78 <Tool
79 Name="VCALinkTool"
80 />
81 <Tool
82 Name="VCManifestTool"
83 />
84 <Tool
85 Name="VCXDCMakeTool"
86 />
87 <Tool
88 Name="VCBscMakeTool"
89 />
90 <Tool
91 Name="VCFxCopTool"
92 />
93 <Tool
94 Name="VCAppVerifierTool"
95 />
96 <Tool
97 Name="VCPostBuildEventTool"
98 />
99 </Configuration>
100 <Configuration
101 Name="Release|Win32"
102 OutputDirectory="$(ReleaseOutputDirectory)"
103 IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
104 ConfigurationType="2"
105 CharacterSet="0"
106 WholeProgramOptimization="1"
107 >
108 <Tool
109 Name="VCPreBuildEventTool"
110 />
111 <Tool
112 Name="VCCustomBuildTool"
113 />
114 <Tool
115 Name="VCXMLDataGeneratorTool"
116 />
117 <Tool
118 Name="VCWebServiceProxyGeneratorTool"
119 />
120 <Tool
121 Name="VCMIDLTool"
122 />
123 <Tool
124 Name="VCCLCompilerTool"
125 AdditionalIncludeDirectories="$(INCLUDE)"
126 PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
127 RuntimeLibrary="2"
128 UsePrecompiledHeader="0"
129 WarningLevel="3"
130 Detect64BitPortabilityProblems="true"
131 DebugInformationFormat="3"
132 CompileAs="0"
133 />
134 <Tool
135 Name="VCManagedResourceCompilerTool"
136 />
137 <Tool
138 Name="VCResourceCompilerTool"
139 />
140 <Tool
141 Name="VCPreLinkEventTool"
142 />
143 <Tool
144 Name="VCLinkerTool"
145 IgnoreImportLibrary="false"
146 LinkLibraryDependencies="true"
147 AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
148 OutputFile="$(OutDir)\libeina.dll"
149 LinkIncremental="1"
150 AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
151 GenerateDebugInformation="true"
152 SubSystem="2"
153 OptimizeReferences="2"
154 EnableCOMDATFolding="2"
155 RandomizedBaseAddress="1"
156 DataExecutionPrevention="0"
157 TargetMachine="1"
158 />
159 <Tool
160 Name="VCALinkTool"
161 />
162 <Tool
163 Name="VCManifestTool"
164 />
165 <Tool
166 Name="VCXDCMakeTool"
167 />
168 <Tool
169 Name="VCBscMakeTool"
170 />
171 <Tool
172 Name="VCFxCopTool"
173 />
174 <Tool
175 Name="VCAppVerifierTool"
176 />
177 <Tool
178 Name="VCPostBuildEventTool"
179 />
180 </Configuration>
181 </Configurations>
182 <References>
183 </References>
184 <Files>
185 <Filter
186 Name="Source Files"
187 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
188 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
189 >
190 <File
191 RelativePath="..\..\src\lib\eina_accessor.c"
192 >
193 </File>
194 <File
195 RelativePath="..\..\src\lib\eina_array.c"
196 >
197 </File>
198 <File
199 RelativePath="..\..\src\lib\eina_benchmark.c"
200 >
201 </File>
202 <File
203 RelativePath="..\..\src\lib\eina_binshare.c"
204 >
205 </File>
206 <File
207
208 RelativePath="..\..\src\lib\eina_convert.c"
209 >
210 </File>
211 <File
212 RelativePath="..\..\src\lib\eina_counter.c"
213 >
214 </File>
215 <File
216 RelativePath="..\..\src\lib\eina_cpu.c"
217 >
218 </File>
219 <File
220 RelativePath="..\..\src\lib\eina_error.c"
221 >
222 </File>
223 <File
224 RelativePath="..\..\src\lib\eina_file_win32.c"
225 >
226 </File>
227 <File
228 RelativePath="..\..\src\lib\eina_fp.c"
229 >
230 </File>
231 <File
232 RelativePath="..\..\src\lib\eina_hamster.c"
233 >
234 </File>
235 <File
236 RelativePath="..\..\src\lib\eina_hash.c"
237 >
238 </File>
239 <File
240 RelativePath="..\..\src\lib\eina_inlist.c"
241 >
242 </File>
243 <File
244 RelativePath="..\..\src\lib\eina_iterator.c"
245 >
246 </File>
247 <File
248 RelativePath="..\..\src\lib\eina_lalloc.c"
249 >
250 </File>
251 <File
252 RelativePath="..\..\src\lib\eina_list.c"
253 >
254 </File>
255 <File
256 RelativePath="..\..\src\lib\eina_log.c"
257 >
258 </File>
259 <File
260 RelativePath="..\..\src\lib\eina_magic.c"
261 >
262 </File>
263 <File
264 RelativePath="..\..\src\lib\eina_main.c"
265 >
266 </File>
267 <File
268 RelativePath="..\..\src\lib\eina_matrixsparse.c"
269 >
270 </File>
271 <File
272 RelativePath="..\..\src\lib\eina_mempool.c"
273 >
274 </File>
275 <File
276 RelativePath="..\..\src\lib\eina_module.c"
277 >
278 </File>
279 <File
280 RelativePath="..\..\src\lib\eina_quadtree.c"
281 >
282 </File>
283 <File
284 RelativePath="..\..\src\lib\eina_rbtree.c"
285 >
286 </File>
287 <File
288 RelativePath="..\..\src\lib\eina_rectangle.c"
289 >
290 </File>
291 <File
292 RelativePath="..\..\src\lib\eina_safety_checks.c"
293 >
294 </File>
295 <File
296 RelativePath="..\..\src\lib\eina_sched.c"
297 >
298 </File>
299 <File
300 RelativePath="..\..\src\lib\eina_share_common.c"
301 >
302 </File>
303 <File
304 RelativePath="..\..\src\lib\eina_strbuf.c"
305 >
306 </File>
307 <File
308 RelativePath="..\..\src\lib\eina_strbuf_common.c"
309 >
310 </File>
311 <File
312 RelativePath="..\..\src\lib\eina_str.c"
313 >
314 </File>
315 <File
316 RelativePath="..\..\src\lib\eina_stringshare.c"
317 >
318 </File>
319 <File
320 RelativePath="..\..\src\lib\eina_tiler.c"
321 >
322 </File>
323 <File
324 RelativePath="..\..\src\lib\eina_unicode.c"
325 >
326 </File>
327 <File
328 RelativePath="..\..\src\lib\eina_ustrbuf.c"
329 >
330 </File>
331 <File
332 RelativePath="..\..\src\lib\eina_ustringshare.c"
333 >
334 </File>
335 <File
336
337 RelativePath="..\..\src\lib\eina_value.c"
338 >
339 </File>
340 <File
341 RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"
342 >
343 </File>
344 <File
345 RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"
346 >
347 </File>
348 <File
349 RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"
350 >
351 </File>
352 <File
353 RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"
354 >
355 </File>
356 </Filter>
357 <Filter
358 Name="Header Files"
359 Filter="h;hpp;hxx;hm;inl;inc;xsd"
360 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
361 >
362 <File
363 RelativePath="..\..\src\include\Eina.h"
364 >
365 </File>
366 <File
367 RelativePath="..\..\src\include\eina_accessor.h"
368 >
369 </File>
370 <File
371 RelativePath="..\..\src\include\eina_array.h"
372 >
373 </File>
374 <File
375 RelativePath="..\..\src\include\eina_benchmark.h"
376 >
377 </File>
378 <File
379 RelativePath="..\..\src\include\eina_binshare.h"
380 >
381 </File>
382 <File
383 RelativePath="..\..\src\include\eina_convert.h"
384 >
385 </File>
386 <File
387 RelativePath="..\..\src\include\eina_counter.h"
388 >
389 </File>
390 <File
391 RelativePath="..\..\src\include\eina_cpu.h"
392 >
393 </File>
394 <File
395 RelativePath="..\..\src\include\eina_error.h"
396 >
397 </File>
398 <File
399 RelativePath="..\..\src\include\eina_file.h"
400 >
401 </File>
402 <File
403 RelativePath="..\..\src\include\eina_fp.h"
404 >
405 </File>
406 <File
407 RelativePath="..\..\src\include\eina_hamster.h"
408 >
409 </File>
410 <File
411 RelativePath="..\..\src\include\eina_hash.h"
412 >
413 </File>
414 <File
415 RelativePath="..\..\src\include\eina_inlist.h"
416 >
417 </File>
418 <File
419 RelativePath="..\..\src\include\eina_iterator.h"
420 >
421 </File>
422 <File
423 RelativePath="..\..\src\include\eina_lalloc.h"
424 >
425 </File>
426 <File
427 RelativePath="..\..\src\include\eina_list.h"
428 >
429 </File>
430 <File
431 RelativePath="..\..\src\include\eina_log.h"
432 >
433 </File>
434 <File
435 RelativePath="..\..\src\include\eina_magic.h"
436 >
437 </File>
438 <File
439 RelativePath="..\..\src\include\eina_main.h"
440 >
441 </File>
442 <File
443 RelativePath="..\..\src\include\eina_matrixsparse.h"
444 >
445 </File>
446 <File
447 RelativePath="..\..\src\include\eina_mempool.h"
448 >
449 </File>
450 <File
451 RelativePath="..\..\src\include\eina_module.h"
452 >
453 </File>
454 <File
455 RelativePath="..\..\src\lib\eina_private.h"
456 >
457 </File>
458 <File
459 RelativePath="..\..\src\include\eina_quadtree.h"
460 >
461 </File>
462 <File
463 RelativePath="..\..\src\include\eina_rbtree.h"
464 >
465 </File>
466 <File
467 RelativePath="..\..\src\include\eina_rectangle.h"
468 >
469 </File>
470 <File
471 RelativePath="..\..\src\include\eina_safety_checks.h"
472 >
473 </File>
474 <File
475 RelativePath="..\..\src\include\eina_strbuf.h"
476 >
477 </File>
478 <File
479 RelativePath="..\..\src\include\eina_strbuf_common.h"
480 >
481 </File>
482 <File
483 RelativePath="..\..\src\include\eina_str.h"
484 >
485 </File>
486 <File
487 RelativePath="..\..\src\include\eina_stringshare.h"
488 >
489 </File>
490 <File
491 RelativePath="..\..\src\include\eina_stringshare.h"
492 >
493 </File>
494 <File
495 RelativePath="..\..\src\include\eina_tiler.h"
496 >
497 </File>
498 <File
499 RelativePath="..\..\src\include\eina_trash.h"
500 >
501 </File>
502 <File
503 RelativePath="..\..\src\include\eina_types.h"
504 >
505 </File>
506 <File
507 RelativePath="..\..\src\include\eina_unicode.h"
508 >
509 </File>
510 <File
511 RelativePath="..\..\src\include\eina_ustrbuf.h"
512 >
513 </File>
514 <File
515 RelativePath="..\..\src\include\eina_ustringshare.h"
516 >
517 </File>
518
519 </Filter>
520 <Filter
521 Name="Resource Files"
522 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
523 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
524 >
525 </Filter>
526 </Files>
527 <Globals>
528 </Globals>
529</VisualStudioProject>