[Moeng-cvs] BBRpg Makefile.in,1.8,1.9 configure,1.12,1.13 rpg.cfg,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/moeng/BBRpg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15068

Modified Files:
	Makefile.in configure rpg.cfg 
Log Message:
Commiting engine changes to our beloved BBRpg on SourceForge.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/moeng/BBRpg/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	7 Feb 2004 19:03:23 -0000	1.8
--- Makefile.in	13 Apr 2004 12:26:07 -0000	1.9
***************
*** 26,30 ****
  .PHONY: default remake clean

! default: $(ENGINE_EXE) $(EDITOR_EXE) data.dat
  remake: clean default

--- 26,30 ----
  .PHONY: default remake clean

! default: $(ENGINE_EXE) $(EDITOR_EXE)
  remake: clean default

***************
*** 41,73 ****
  	$(CC) $(CPPFLAGS) -o $(EDITOR_EXE) $(COMMON_OBJS) $(EDITOR_OBJS) $(COMMON_LIBS)

! # data.dat updater, vraagt de lijst vernieuwde datafiles op, loopt ze langs, kijkt waar ze bij horen
! # voegt ze toe aan de bij de groep behorende variabele en update dan de juiste groepen (door te 
! # testen op niet lege variables
  data.dat: $(DATA_LUA) $(DATA_BMP) $(DATA_FONT) $(DATA_MAP) $(DATA_SAMPS) $(DATA_MIDIS)
! 	@list='$?'; \
! 	for file in $$list; do \
! 	  if echo "$(DATA_LUA)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DELUAS="$$DELUAS $$file"; \
! 	  fi; \
! 	  if echo "$(DATA_BMP)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DEBMPS="$$DEBMPS $$file"; \
! 	  fi; \
! 	  if echo "$(DATA_FONT)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DEFONTS="$$DEFONTS $$file"; \
! 	  fi; \
! 	  if echo "$(DATA_MAP)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DEMAPS="$$DEMAPS $$file"; \
! 	  fi; \
! 	  if echo "$(DATA_SAMPS)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DESAMPS="$$DESAMPS $$file"; \
! 	  fi; \
! 	  if echo "$(DATA_MIDIS)" | grep "$$file" > /dev/null 2>/dev/null ; then \
! 	    DEMIDIS="$$DEMIDIS $$file"; \
! 	  fi; \
! 	done;\
! 	if test -n "$$DELUAS" ; then dat -a -k -t LUA data.dat $$DELUAS; fi; \
! 	if test -n "$$DEBMPS" ; then dat -a -k -t BMP data.dat $$DEBMPS; fi; \
! 	if test -n "$$DEFONTS" ; then dat -a -k -t FONT data.dat $$DEFONTS; fi; \
! 	if test -n "$$DEMAPS" ; then dat -a -k -t MAP data.dat $$DEMAPS; fi; \
! 	if test -n "$$DESAMPS" ; then dat -a -k -t SAMP data.dat $$DESAMPS; fi; \
! 	if test -n "$$DEMIDIS" ; then dat -a -k -t MIDI data.dat $$DEMIDIS; fi; \
--- 41,52 ----
  	$(CC) $(CPPFLAGS) -o $(EDITOR_EXE) $(COMMON_OBJS) $(EDITOR_OBJS) $(COMMON_LIBS)

! # Recreate data.dat
  data.dat: $(DATA_LUA) $(DATA_BMP) $(DATA_FONT) $(DATA_MAP) $(DATA_SAMPS) $(DATA_MIDIS)
! 	rm -vf data.dat
! 	dat -a -t BMP  -c0 -k data.dat data/bitmaps/*.bmp
! 	dat -a -t BMP  -c0 -k data.dat data/bitmaps/*.tga
! 	dat -a -t FONT -c0 -k data.dat data/bitmaps/font_*.pcx
! 	dat -a -t LUA  -c0 -k data.dat data/scripts/*.lua
! 	dat -a -t MAP  -c0 -k data.dat data/maps/*.map
! 	dat -a -t SAMP -c0 -k data.dat data/samples/*.wav
! 	if test -n "$$DATA_MIDIS"; then dat -a -t MIDI -c0 -k data.dat $$DEMIDIS; fi;

Index: rpg.cfg
===================================================================
RCS file: /cvsroot/moeng/BBRpg/rpg.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rpg.cfg	13 Jan 2004 16:32:34 -0000	1.7
--- rpg.cfg	13 Apr 2004 12:26:07 -0000	1.8
***************
*** 8,12 ****
  [Video]
  Fullscreen=0
! DoubleSize=1
  VSync=0
  ResolutionWidth=320
--- 8,12 ----
  [Video]
  Fullscreen=0
! DoubleSize=0
  VSync=0
  ResolutionWidth=320

Index: configure
===================================================================
RCS file: /cvsroot/moeng/BBRpg/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configure	13 Jan 2004 16:32:34 -0000	1.12
--- configure	13 Apr 2004 12:26:07 -0000	1.13
***************
*** 4,10 ****

  CC=g++
! LIBS=
  LIBS_ENGINE=
! CPPFLAGS=-Wall
  # on windows set EXE_EXT to '.exe'
  EXE_EXT=
--- 4,10 ----

  CC=g++
! LIBS="`pkg-config --libs libxml-2.0`"
  LIBS_ENGINE=
! CPPFLAGS="-Wall `pkg-config --cflags libxml-2.0`"
  # on windows set EXE_EXT to '.exe'
  EXE_EXT=
***************
*** 97,107 ****
  echo "allegro-config --version" >>$LOGERR
  if allegro-config --version >>$LOG 2>>$LOGERR ; then
!     LIBS="$LIBS `allegro-config --libs`"
!     CPPFLAGS="$CPPFLAGS `allegro-config --cppflags`"
!     echo "yes"
  else
      echo "no"
      echo "*** No allegro-config found. Please add the right directory to PATH or install allegro"
!     echo "using -lalleg instead"
      LIBS="$LIBS -lalleg"
  fi
--- 97,117 ----
  echo "allegro-config --version" >>$LOGERR
  if allegro-config --version >>$LOG 2>>$LOGERR ; then
!     allegro_version_major=`allegro-config --version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
!     allegro_version_minor=`allegro-config --version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
!     allegro_version_micro=`allegro-config --version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
!     # version check
!     if test "$allegro_version_major" -ge "4" -a "$allegro_version_minor" -ge "1" ; then
! 	LIBS="$LIBS `allegro-config --libs`"
! 	CPPFLAGS="$CPPFLAGS `allegro-config --cppflags`"
! 	echo "yes ($allegro_version_major.$allegro_version_minor.$allegro_version_micro)"
!     else
! 	echo "found"
! 	echo "*** Allegro version to old. required: 4.1.0 or higher."
! 	exit 1;
!     fi
  else
      echo "no"
      echo "*** No allegro-config found. Please add the right directory to PATH or install allegro"
!     echo "Trying -lalleg instead"
      LIBS="$LIBS -lalleg"
  fi
***************
*** 131,135 ****
  else
      echo "no"
!     echo "*** Allegro not working"
      exit 1
  fi
--- 141,146 ----
  else
      echo "no"
!     echo "*** Compiling of Allegro program failed"
!     echo "*** Please install Allegro. http://alleg.sourceforge.net/"
      exit 1
  fi