X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fexample%2FMakefile;h=6b80deb9599aba6aa0242cb7594a9a3f8835c3cc;hb=d193d733dfa41679452284e4e60e7237ac721cba;hp=a8c85eb60ee8994d669b2dc6172e4c0fa2be89c3;hpb=50f0c053c8be3ac812a8aab1143187a28f324209;p=swftools.git

diff --git a/lib/example/Makefile b/lib/example/Makefile
index a8c85eb..6b80deb 100644
--- a/lib/example/Makefile
+++ b/lib/example/Makefile
@@ -1,8 +1,8 @@
 # Makefile
 
-RFXSWF	= ../rfxswf.o
-LDLIBS	= -ljpeg -lm -lz 
-CFLAGS	= -funsigned-char
+RFXSWF	= ../librfxswf.a
+LDLIBS	= -L/usr/X11R6/lib -ljpeg -lm -lz -lX11
+#CFLAGS	= -funsigned-char
 CC	= gcc
 CXX	= g++
 DBFLAGS	= -g2
@@ -12,9 +12,10 @@ DBFLAGS	= -g2
 %.o: %.cc
 		$(CXX) -c $(CFLAGS) $(DBFLAGS) -o $@ $<
 
-all: jpegtest box shape1 transtest zlibtest sprites buttontest dumpfont text makefonts glyphshape avi2swf
+all: sound jpegtest box shape1 transtest zlibtest sprites buttontest dumpfont text makefonts glyphshape edittext
 
-movies: jpegtest box shape1 transtest zlibtest sprites buttontest dumpfont text glyphshape
+movies: sound jpegtest box shape1 transtest zlibtest sprites buttontest dumpfont text glyphshape edittext
+		./sound
 		./jpegtest
 		./box
 		./glyphshape
@@ -25,12 +26,10 @@ movies: jpegtest box shape1 transtest zlibtest sprites buttontest dumpfont text
 		./buttontest
 		./text
 		./makefonts
+		./edittext
 
-avi2swf.o: avi2swf.cc
-		$(CXX) -o avi2swf.o -c avi2swf.cc `avifile-config --cflags`
-
-avi2swf: $(RFXSWF) avi2swf.o
-		$(CXX) -o avi2swf avi2swf.o  $(RFXSWF) $(LDLIBS) `avifile-config --libs`
+sound: $(RFXSWF) sound.o
+		$(CC) -o sound sound.o $(RFXSWF) $(LDLIBS) $(DBFLAGS)
 
 box: $(RFXSWF) box.o
 		$(CC) -o box box.o $(RFXSWF) $(LDLIBS) $(DBFLAGS)
@@ -59,12 +58,15 @@ transtest: $(RFXSWF) transtest.o
 text: $(RFXSWF) text.o
 		$(CC) -o text text.o $(RFXSWF) $(LDLIBS) $(DBFLAGS)
 
+edittext: $(RFXSWF) edittext.o
+		$(CC) -o edittext edittext.o $(RFXSWF) $(LDLIBS) $(DBFLAGS)
+
 zlibtest: $(RFXSWF) zlibtest.o
 		$(CC) -o zlibtest zlibtest.o $(RFXSWF) $(LDLIBS) $(DBFLAGS)
 
 makefonts: $(RFXSWF) makefonts.o ../../pdf2swf/swfoutput.o
 		$(CXX) -o makefonts makefonts.o ../../pdf2swf/swfoutput.o \
-                ../../pdf2swf/spline.o ../rfxswf.o ../log.o -lt1 $(LDLIBS) \
+                ../../pdf2swf/spline.o ../../pdf2swf/encodings.o ../librfxswf.a -lt1 $(LDLIBS) \
                 ../../pdf2swf/xpdf/libpdf.a $(DBFLAGS)
 
 clean:
@@ -72,6 +74,7 @@ clean:
                 sprites.o glyphshape.o \
 		buttontest.o dumpfont.o text.o makefonts.o\
 		jpegtest.swf box.swf shape1.swf trastest.swf zlibtest.swf \
-                sprites.swf buttontest.swf text.swf glyphshape.swf
+                sprites.swf buttontest.swf text.swf glyphshape.swf sound.swf \
+		transtest.swf