[Epfl-cvs] tgengine-0.1 Makefile.MSYS,NONE,1.1 Makefile,1.17,1.18 defs.h,1.8,1.9 tgglext.cc,1.6,1.7

[Luis C. <ce...@us...>]

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

Modified Files:
	Makefile defs.h tgglext.cc 
Added Files:
	Makefile.MSYS 
Log Message:
Premiere partie de changements pour le portage sur win32

Index: defs.h
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/defs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** defs.h	30 Nov 2004 18:21:55 -0000	1.8
--- defs.h	5 Dec 2004 18:01:17 -0000	1.9
***************
*** 15,25 ****
  #include "tg_stl/vector.h"
  
- #ifdef TGWIN32
- #include <SDL/SDL.h>
- #include <SDL/SDL_image.h>
- #else
  #include <SDL.h>
  #include <SDL_image.h>
- #endif
  
  namespace tg
--- 15,20 ----

--- NEW FILE: Makefile.MSYS ---
## TG Engine Makefile
##

OBJ_EXT = o
OBJSRC = $(wildcard *.cc)
OBJS = $(addsuffix .${OBJ_EXT}, $(basename $(OBJSRC)))
CFLAGS = -DTGLINUX -O3 -DDEBUG 
CC = g++

DLL_LDLIBS = -lopengl32 -lglu32 `sdl-config --libs` -lSDL_Image -L/usr/local/lib -lvorbisfile -lAlut -lopenal32
.cc.${OBJ_EXT}:
	$(CC) -c  $(CFLAGS) -Wall -I /usr/local/include -I/usr/local/include/SDL -I./ $< -o $@

all : $(OBJS)
#	$(CC) -shared -o out/libtgengine.so $(OBJS) ${DLL_LDLIBS}
	${CC} -shared -W1,--out-implib=out/libtgengine.so -o out/libtgengine.dll ${OBJS} -W1,--export-all-symbols ${DLL_LDLIBS}

clean :
	rm -f out/*
	rm -f *.o
	rm -f *~

Index: Makefile
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile	17 Nov 2004 23:12:37 -0000	1.17
--- Makefile	5 Dec 2004 18:01:15 -0000	1.18
***************
*** 28,29 ****
--- 28,38 ----
  	make -f Makefile.OSX "CFLAGS = -DTGOSX -DDEBUG -DTGVIDEO -I/sw/include/ffmpeg/"
  
+ msys:
+ 	make -f Makefile.MSYS "CFLAGS = -O3 -DTGWIN32"
+ 
+ msysDebug:
+ 	make -f Makefile.MSYS "CFLAGS = -ggdb -DDEBUG -DTGWIN32"
+ 
+ msysVideo:
+ 	make -f Makefile.MSYS "CFLAGS = -DDEBUG -DTGWIN32 -DTGVIDEO"
+ 

Index: tgglext.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/tgglext.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tgglext.cc	5 Dec 2004 14:29:55 -0000	1.6
--- tgglext.cc	5 Dec 2004 18:01:17 -0000	1.7
***************
*** 39,43 ****
  
  #ifdef TGWIN32
! #define GETARBPOINTER(var,type,name) var = (type)wglGetProcAddress(name);
  #endif
  #ifdef TGLINUX
--- 39,46 ----
  
  #ifdef TGWIN32
! #define GETARBPOINTER(var,type,name) \
! 			var = (type)SDL_GL_GetProcAddress(name); \
! 			if (!var) \
! 				std::cerr << "Erreur lors du chargement de la fonction : " << name << std::endl;
  #endif
  #ifdef TGLINUX