Menu
▾
▴
[Gemrb-commits] gemrb/gemrb gemrb,1.4,1.5 GemRB.cpp,1.7,1.8 Makefile,1.4,1.5 Makefile.in,1.4,1.5
|
From: <bal...@us...> - 2003-10-22 21:20:48
|
Update of /cvsroot/gemrb/gemrb/gemrb
In directory sc8-pr-cvs1:/tmp/cvs-serv3031/gemrb
Modified Files:
gemrb GemRB.cpp Makefile Makefile.in
Log Message:
Updated Linux Project and Makefiles
Index: gemrb
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/gemrb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gemrb 21 Oct 2003 19:05:33 -0000 1.4
--- gemrb 22 Oct 2003 21:17:07 -0000 1.5
***************
*** 19,23 ****
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
! relink_command="cd /home/daniele/gemrb/gemrb; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr//bin:/bin:/usr/bin::/usr/local/bin:/usr/X11R6/bin:/usr/games:/usr/java/j2sdk1.4.2_01/bin:/home/daniele/bin:/usr/java/j2sdk1.4.2_01/bin\"; export PATH; c++ -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -fno-builtin -g -O2 -O0 -g3 -Wall -fno-exceptions -fno-check-new -o \$progdir/\$file GemRB.o ./plugins/AREImporter/.libs/libAREImporter.so -L/home/daniele/gemrb/gemrb/plugins/Core -L/usr//bin/../lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2 -L/usr//bin/../lib/gcc-lib -L/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2 -L/usr//bin/../lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/../../.. -L/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/../../.. ./plugins/BAMImporter/.libs/libBAMImporter.so ./plugins/BG2HCAnim/.libs/libBG2HCAnim.so ./plugins/BIFImporter/.libs/libBIFImporter.so ./plugins/BMPImporter/.libs/libBMPImporter.so ./plugins/CHUImporter/.libs/libCHUImporter.so ./plugins/Core/.libs/libcore.so ./plugins/CREImporter/.libs/libCREImporter.so ./plugins/IDSImporter/.libs/libIDSImporter.so ./plugins/KEYImporter/.libs/libKEYImporter.so ./plugins/MOSImporter/.libs/libMOSImporter.so ./plugins/MVEPlayer/.libs/libMVEPlayer.so ./plugins/SDLVideo/.libs/libSDLVideo.so /usr/lib/libSDL.so -L/usr/X11R6/lib -lX11 -lXext -lpthread ./plugins/TISImporter/.libs/libTISImporter.so ./plugins/TLKImporter/.libs/libTLKImporter.so ./plugins/WEDImporter/.libs/libWEDImporter.so ./plugins/ZLibMgr/.libs/libZLibMgr.so -lz ./plugins/GUIScript/.libs/libGUIScript.so /home/daniele/gemrb/gemrb/plugins/Core/.libs/libcore.so -ldl -lpython2.3 -lstdc++ -lm -lc -lgcc_s -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/AREImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BAMImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BG2HCAnim/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BIFImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BMPImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/CHUImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/Core/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/CREImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/IDSImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/KEYImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/MOSImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/MVEPlayer/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/SDLVideo/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/TISImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/TLKImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/WEDImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/ZLibMgr/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/GUIScript/.libs -Wl,--rpath -Wl,/usr/local/lib"
# This environment variable determines our operation mode.
--- 19,23 ----
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
! relink_command="cd /home/daniele/gemrb/gemrb; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/lib/qt3/bin:/usr//bin:/bin:/usr/bin::/usr/local/bin:/usr/X11R6/bin:/usr/games:/usr/java/j2sdk1.4.2_01/bin:/home/daniele/bin\"; export PATH; c++ -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -fno-builtin -g -O2 -O0 -g3 -Wall -fno-exceptions -fno-check-new -o \$progdir/\$file GemRB.o ./plugins/AREImporter/.libs/libAREImporter.so -L/home/daniele/gemrb/gemrb/plugins/Core -L/usr//bin/../lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2 -L/usr//bin/../lib/gcc-lib -L/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2 -L/usr//bin/../lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/../../.. -L/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/../../.. ./plugins/BAMImporter/.libs/libBAMImporter.so ./plugins/BG2HCAnim/.libs/libBG2HCAnim.so ./plugins/BIFImporter/.libs/libBIFImporter.so ./plugins/BMPImporter/.libs/libBMPImporter.so ./plugins/CHUImporter/.libs/libCHUImporter.so ./plugins/Core/.libs/libcore.so ./plugins/CREImporter/.libs/libCREImporter.so ./plugins/IDSImporter/.libs/libIDSImporter.so ./plugins/KEYImporter/.libs/libKEYImporter.so ./plugins/MOSImporter/.libs/libMOSImporter.so ./plugins/MVEPlayer/.libs/libMVEPlayer.so ./plugins/SDLVideo/.libs/libSDLVideo.so /usr/lib/libSDL.so -L/usr/X11R6/lib -lX11 -lXext -lpthread ./plugins/TISImporter/.libs/libTISImporter.so ./plugins/TLKImporter/.libs/libTLKImporter.so ./plugins/WEDImporter/.libs/libWEDImporter.so ./plugins/ZLibMgr/.libs/libZLibMgr.so -lz ./plugins/GUIScript/.libs/libGUIScript.so /home/daniele/gemrb/gemrb/plugins/Core/.libs/libcore.so -ldl -lpython2.3 -lstdc++ -lm -lc -lgcc_s -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/AREImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BAMImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BG2HCAnim/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BIFImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/BMPImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/CHUImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/Core/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/CREImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/IDSImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/KEYImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/MOSImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/MVEPlayer/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/SDLVideo/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/TISImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/TLKImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/WEDImporter/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/ZLibMgr/.libs -Wl,--rpath -Wl,/home/daniele/gemrb/gemrb/plugins/GUIScript/.libs -Wl,--rpath -Wl,/usr/local/lib"
# This environment variable determines our operation mode.
Index: GemRB.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GemRB.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GemRB.cpp 21 Oct 2003 20:45:41 -0000 1.7
--- GemRB.cpp 22 Oct 2003 21:17:07 -0000 1.8
***************
*** 32,38 ****
char fpsstring[_MAX_PATH];
Color fpscolor = {0xff,0xff,0xff,0x00}, fpsblack = {0x00,0x00,0x00,0x00};
- Color * palette = core->GetVideoDriver()->CreatePalette(fpscolor, fpsblack);
int frame = 0, time, timebase = 0;
double frames = 0.0;
#ifndef WIN32
struct timeval tv;
--- 32,39 ----
char fpsstring[_MAX_PATH];
Color fpscolor = {0xff,0xff,0xff,0x00}, fpsblack = {0x00,0x00,0x00,0x00};
int frame = 0, time, timebase = 0;
double frames = 0.0;
+ Region bg(0,0,100,30);
+ Color * palette = core->GetVideoDriver()->CreatePalette(fpscolor, fpsblack);
#ifndef WIN32
struct timeval tv;
***************
*** 58,61 ****
--- 59,63 ----
}
sprintf(fpsstring, "%.3f fps", frames);
+ core->GetVideoDriver()->DrawRect(bg, fpsblack);
fps->Print(Region(0,0,100,20), (unsigned char *)fpsstring, palette, IE_FONT_ALIGN_LEFT | IE_FONT_ALIGN_MIDDLE,true);
} while(core->GetVideoDriver()->SwapBuffers() == GEM_OK);
Index: Makefile
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Index: Makefile.in
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
|