Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/images
Modified Files:
bg.edc
Log Message:
- Make bg.edc compile for me. Substitutions into strings doesn't do what was
expected
===================================================================
RCS file: /cvs/e/e17/libs/ewl/data/images/bg.edc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- bg.edc 9 Feb 2007 04:42:41 -0000 1.16
+++ bg.edc 9 Feb 2007 08:35:16 -0000 1.17
@@ -1,12 +1,8 @@
-#define STR(x) "x"
- /* #define CATSTR(x, y) STR(x## y)
-#define CATPNG(x, y) STR(x##y.png)
-*/
#define TOUR_IMAGE(PNAME) \
- image, STR(PNAME)".png" LOSSY 98; \
- image, STR(PNAME)"1.png" LOSSY 98; \
- image, STR(PNAME)"2.png" LOSSY 98; \
- image, STR(PNAME)"3.png" LOSSY 98;
+ image, #PNAME".png" LOSSY 98; \
+ image, #PNAME"1.png" LOSSY 98; \
+ image, #PNAME"2.png" LOSSY 98; \
+ image, #PNAME"3.png" LOSSY 98;
#define TOUR_PART(PNAME, ASPECT) \
description { \
state, PNAME 0.0; \
@@ -19,7 +15,7 @@
offset, -1 -1; \
} \
image { \
- normal, STR(PNAME)".png"; \
+ normal, #PNAME".png"; \
} \
} \
description { \
@@ -33,37 +29,37 @@
offset, -1 -1; \
} \
image { \
- tween, STR(PNAME)"1.png"; \
- tween, STR(PNAME)"2.png"; \
- normal, STR(PNAME)"3.png"; \
+ tween, #PNAME"1.png"; \
+ tween, #PNAME"2.png"; \
+ normal, #PNAME"3.png"; \
} \
}
#define TOUR_PROG(PNAME, TEXT, PNEXT, TARGET) \
program { \
- name, STR(PNAME)"_start"; \
+ name, #PNAME"_start"; \
signal, PNAME; \
source, "*"; \
- action, SIGNAL_EMIT TEXT STR(PNAME); \
- after, STR(PNAME)"_flip"; \
+ action, SIGNAL_EMIT TEXT #PNAME; \
+ after, #PNAME"_flip"; \
} \
program { \
- name, STR(PNAME)"_flip"; \
- action, STATE_SET STR(PNAME) 0.0; \
+ name, #PNAME"_flip"; \
+ action, STATE_SET #PNAME 0.0; \
transition, LINEAR 0.0; \
- target, STR(TARGET); \
- after, STR(PNAME)"_continue"; \
+ target, #TARGET; \
+ after, #PNAME"_continue"; \
} \
program { \
- name, STR(PNAME)"_continue"; \
- action, STATE_SET STR(PNAME) 1.0; \
+ name, #PNAME"_continue"; \
+ action, STATE_SET #PNAME 1.0; \
transition, LINEAR 10.0; \
- target, STR(TARGET); \
- after, STR(PNEXT)"_trigger"; \
+ target, #TARGET; \
+ after, #PNEXT"_trigger"; \
} \
program { \
- name, STR(PNEXT)"_trigger"; \
- action, SIGNAL_EMIT STR(PNEXT) "tour"; \
+ name, #PNEXT"_trigger"; \
+ action, SIGNAL_EMIT #PNEXT "tour"; \
}
images {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
