Anonymous committed ac3cad6

Successful compilation and installation state for module, just uncomment _movie line in

  • Participants
  • Parent commits 971bac1
  • Branches tylerthemovie

Comments (0)

Files changed (8)

 SCRAP = -lX11
 PORTMIDI = -lportmidi
 PORTTIME = -lporttime
-FFMPEG   = -lavformat -lswscale -lSDL_mixer
+AVCODEC   = -lavcodec 
+AVFORMAT  = -lavformat 
+AVDEVICE  = -lavdevice 
+AVUTIL    = -lavutil 
+SWSCALE   = -lswscale 
+ZLIB = -lz
 #DEBUG = -C-W -C-Wall
 _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
 _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
 movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-_movie src/_gsound.c src/_gmovie.c src/gmovie.c src/_gcommand.c $(SDL) $(FFMPEG) $(DEBUG)
+#_movie src/_gsound.c src/_gmovie.c src/_gcommand.c src/gmovie.c $(SDL) $(AVCODEC) $(AVFORMAT) $(AVUTIL)  $(AVDEVICE)  $(SWSCALE) $(MIXER) -lz -lwsock32  $(DEBUG)
 scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
 _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
 pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)


         Dependency('JPEG', 'jpeglib.h', 'libjpeg.dll.a'),
         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.dll.a'),
         Dependency('PORTTIME', 'portmidi.h', 'libportmidi.dll.a'),
-		Dependency('FFMPEG', 'libavformat/avformat.h', 'libavformat.a', ['avformat', 'swscale', 'SDL_mixer']),     
-        DependencyDLL('TIFF'),
+		Dependency('AVFORMAT', 'libavformat/avformat.h', 'libavformat.a'), 
+		Dependency('AVCODEC', 'libavcodec/avcodec.h', 'libavcodec.a'),
+		Dependency('AVUTIL', 'libavutil/avutil.h', 'libavutil.a'),
+        Dependency('AVDEVICE', 'libavdevice/avdevice.h', 'libavdevice.a'),
+		Dependency('SWSCALE', 'libswscale/swscale.h', 'libswscale.a'),		
+		DependencyDLL('TIFF'),
     ('SDL', 'SDL', r'SDL\.dll$', []),
     ('PORTMIDI', 'portmidi', r'portmidi\.dll', []),
     ('PORTTIME', 'portmidi', r'portmidi\.dll', []),
-    ('AVCODEC', 'avcodec', r'avcodec-50\.dll', []),
+    ('AVCODEC', 'avcodec', r'avcodec\.dll', []),
     ('AVFORMAT', 'avformat', r'avformat-52\.dll', []),
     ('AVDEVICE', 'avdevice', r'avdevice-52\.dll', []),
-    ('AVUTIL', 'avutil', r'avutil-50\.dll', []),
-    ('SWSCALE', 'swscale', r'swscale-0.\dll', []),
+    ('AVUTIL', 'avutil', r'avutil\.dll', []),
+    ('SWSCALE', 'swscale', r'swscale\.dll', []),
 # regexs: Maps name to DLL file name regex.


 print "Please give an (absolute)filename of a movie file you'd like to play: ",
 #filename = raw_input()
 #initialization. It could also have a surface as a second argument, and every 
 # frame will be blitted to that surface. It is the programmer's responsibility
 # to be on time for rendering that surface.
 print m         #calls __repr__, which will show the filename, and the current 
                 # timestamp. 
 #print "repeated looping plays.."#
 print "Playing infinitely"


 IHDR := -I$(pmcom) -I$(pmwin) -I$(pt)
 LIBS := $(LOADLIBES) $(LDLIBS) -lwinmm
 all : $(pmdll)
 .PHONY : all
 \tsed 's_#define DEBUG.*$$_/*&*/_' < "$<" > "$@"
 $(pmlib) : $(src) $(hdr)
-\t$(CC) $(CPPFLAGS) $(IHDR) -c $(CFLAGS) $(src)
+\tc++ $(CPPFLAGS) $(IHDR) -c $(CFLAGS) $(src)
 \tar rc $(pmlib) $(obj)
 \tranlib $(pmlib)
 $(pmdll) : $(pmlib) $(def)
-\t$(CC) -shared $(LDFLAGS) -def $(def) $(pmlib) $(LIBS) -o $@
+\tc++ -shared $(LDFLAGS) -def $(def) $(pmlib) $(LIBS) -o $@
 \tdlltool -D $(pmdll) -d $(def) -l $(pmimplib)
 \tranlib $(pmimplib)

File prebuilt-template/

 OGG = -Iprebuilt/include/ogg -logg
 PORTMIDI = -lportmidi
+FFMPEG   = -lavcodec -lavformat -lavdevice -lavutil -lswscale -lSDL_mixer 
 COPYLIB_SDL -Lprebuilt/lib/SDL.dll
 COPYLIB_SDL_ttf -lSDL -lfreetype -Lprebuilt/lib/SDL_ttf.dll
 COPYLIB_SDL_image -lSDL -ljpef -lpng -ltiff -Lprebuilt/lib/SDL_image.dll

File src/_gmovie.h

 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
 /*constant definitions */
 #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
 #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)

File src/_gsound.h

 #include <SDL.h>
 #include <SDL_thread.h>
 #include <libavformat/avformat.h>
 typedef struct BufferNode
     uint8_t *buf;