[Epfl-cvs] tgengine-0.1 Makefile.OSX,1.8,1.9 video.h,1.1,1.2

[Seb <whi...@us...>]

Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252

Modified Files:
	Makefile.OSX video.h 
Log Message:
Portage OSX pour la capture video (pas encore fonctionnel)


Index: video.h
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/video.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** video.h	11 Nov 2004 10:39:33 -0000	1.1
--- video.h	11 Nov 2004 19:20:45 -0000	1.2
***************
*** 22,26 ****
--- 22,32 ----
  
  #include <stdio.h>
+ 
+ #ifdef TGOSX
+ #include <malloc/malloc.h>
+ #else
  #include <malloc.h>
+ #endif
+ 
  #include <avcodec.h>
  

Index: Makefile.OSX
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/Makefile.OSX,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.OSX	2 Nov 2004 15:32:15 -0000	1.8
--- Makefile.OSX	11 Nov 2004 19:20:45 -0000	1.9
***************
*** 7,11 ****
  OBJS = $(addsuffix .${OBJ_EXT}, $(basename $(OBJSRC)))
  LIBS = -lvorbis -lvorbisfile -framework OpenAL `sdl-config --libs` -lSDL_image
! CFLAGS = -DTGOSX -O3 -DDEBUG -DSOUND_DEBUG
  CC = g++
  
--- 7,11 ----
  OBJS = $(addsuffix .${OBJ_EXT}, $(basename $(OBJSRC)))
  LIBS = -lvorbis -lvorbisfile -framework OpenAL `sdl-config --libs` -lSDL_image
! CFLAGS = -DTGOSX -O3 -DDEBUG -DSOUND_DEBUG -DTGVIDEO -I../ffmpeg-0.4.8/libavcodec/
  CC = g++