Updates to the unix sample app.
Rather than placing pixels, use XPutImage to place the bitmap on screen.
Modify the color arrangements for 8888 when building the sample app, so
they agree with X.
Add a title to simple sample.
Include SkTouchGesture.
git-svn-id: http://skia.googlecode.com/svn/trunk@963 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/unix_test_app/makefile b/unix_test_app/makefile
index 0690435..6234679 100644
--- a/unix_test_app/makefile
+++ b/unix_test_app/makefile
@@ -12,12 +12,12 @@
-I../include/utils/unix \
-I../samplecode
-VPATH = libs:../src/ports:../samplecode:../src/core:../out:../src/utils/unix
+VPATH = libs:../src/ports:../samplecode:../src/core:../src/utils/unix
#generate debugging info
CFLAGS = -g
-SRC_LIST := main.cpp SkOSWindow_Unix.cpp SkXMLParser_empty.cpp SkDebug.cpp keysym2ucs.c
+SRC_LIST := main.cpp SkOSWindow_Unix.cpp SkXMLParser_empty.cpp SkDebug.cpp
#views files
include ../src/views/views_files.mk
@@ -31,6 +31,17 @@
include ../samplecode/samplecode_files.mk
SRC_LIST += $(addprefix ../samplecode/, $(SOURCE))
-output: $(SRC_LIST) -lX11 -lskia -lpthread -lz -lfreetype -lGL -lpng
+
+out/output: $(SRC_LIST) out/keysym2ucs.o ../out/libskia.a -lX11 -lpthread -lz -lfreetype -lGL -lpng
g++ $(C_INCLUDES) $(CFLAGS) $^ -o $@
+out/keysym2ucs.o: ../src/utils/unix/keysym2ucs.c
+ @mkdir -p $(dir $@)
+ @gcc -c $(C_INCLUDES) $(CFLAGS) $^ -o $@
+
+../out/libskia.a:
+ @$(MAKE) -C ../ SKIA_SAMPLES_FOR_X=true
+
+clean:
+ rm -rf ../out # Copied from ../Makefile
+ rm -rf out