commit 25d523c1f86d52cfc814e6c11615ae21478eba44
parent f5a78d186f813021cbe6acc116a41be5f7d6b983
Author: pancake <pancake@nopcode.org>
Date: Wed, 1 Sep 2010 00:31:19 +0200
fix fPIC compilation
Diffstat:
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all t clean install
+.PHONY: all rmo t clean install
-include config.mk
@@ -36,10 +36,13 @@ config.h:
config.mk: config.h
cp config.def.mk config.mk
-clean:
+clean: rmo
echo >swk.mk
cd t && ${MAKE} clean
- rm -f swk.pc swk.mk libswk.a libswk.so ${OBJS} ${GI_OBJS}
+ rm -f swk.pc swk.mk libswk.a libswk.so ${GI_OBJS}
+
+rmo:
+ rm -f ${OBJS}
install:
mkdir -p ${DESTDIR}/${INCDIR}
@@ -63,12 +66,12 @@ static: libswk.a
shared: libswk.so
-libswk.so: config.mk ${OBJS} ${GI_OBJS}
+libswk.so: rmo config.mk ${OBJS} ${GI_OBJS}
${CC} ${CFLAGS} -fPIC -shared ${OBJS} ${GI_SRCS} -o libswk.so
swk.o: config.mk
-libswk.a: config.mk ${OBJS} ${GI_OBJS}
+libswk.a: rmo config.mk ${OBJS} ${GI_OBJS}
rm -f libswk.a
ar qcvf libswk.a ${OBJS} ${GI_OBJS}
echo SWKINCS+=-I${PREFIX}/include > swk.mk
diff --git a/TODO b/TODO
@@ -1,5 +1,7 @@
TODO
====
+ * install and load ttf font. allow to override font path
+ * define default image path in config.h
* change cursor
* change window title in runtime?
* how to schedule a function to be executed in N ns?
@@ -19,13 +21,6 @@ TODO
* add support to resize images (scaling)
* only focus buttons and entries (input widgets)
- will make the design inconsistent and the code more complex
- * allow to load images from memory instead of files
- * define default image path in config.h
-
-Transitions
-===========
- * transitions (to change from one window to another)
- - this can be done in a simple loop() calling swk_update and using colpos
Events
======