[Smgl-cvs] IceCreamDrop/src ICDHuman.cpp,1.2,1.3 Makefile.am,1.2,1.3 Makefile.in,1.3,1.4

[Mark D. <li...@us...>]

Update of /cvsroot/smgl/IceCreamDrop/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23056/src

Modified Files:
	ICDHuman.cpp Makefile.am Makefile.in 
Log Message:
Changed DATADIR to ICDDATADIR to remove conflict in windows


Index: Makefile.in
===================================================================
RCS file: /cvsroot/smgl/IceCreamDrop/src/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in	14 Jul 2004 16:03:43 -0000	1.3
--- Makefile.in	14 Oct 2004 19:57:17 -0000	1.4
***************
*** 67,70 ****
--- 67,71 ----
  PATH_SEPARATOR = @PATH_SEPARATOR@
  AMTAR = @AMTAR@
+ AR = @AR@
  AS = @AS@
  AWK = @AWK@
***************
*** 76,79 ****
--- 77,84 ----
  DLLTOOL = @DLLTOOL@
  ECHO = @ECHO@
+ EGREP = @EGREP@
+ F77 = @F77@
+ GCJ = @GCJ@
+ GCJFLAGS = @GCJFLAGS@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LIBTOOL = @LIBTOOL@
***************
*** 82,85 ****
--- 87,91 ----
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
+ RC = @RC@
  SDL_CFLAGS = @SDL_CFLAGS@
  SDL_CONFIG = @SDL_CONFIG@
***************
*** 106,110 ****
  IceCreamDrop_LDADD = $(LIBS)
  IceCreamDrop_LDFLAGS = $(LDFLAGS)
! IceCreamDrop_CXXFLAGS = -DDATADIR=\"$(prefix)/share/IceCreamDrop/\"
  subdir = src
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 112,116 ----
  IceCreamDrop_LDADD = $(LIBS)
  IceCreamDrop_LDFLAGS = $(LDFLAGS)
! IceCreamDrop_CXXFLAGS = -DICDDATADIR=\"$(prefix)/share/IceCreamDrop/\"
  subdir = src
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Index: Makefile.am
===================================================================
RCS file: /cvsroot/smgl/IceCreamDrop/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	12 Jul 2004 00:49:39 -0000	1.2
--- Makefile.am	14 Oct 2004 19:57:17 -0000	1.3
***************
*** 10,12 ****
  IceCreamDrop_LDADD = $(LIBS)
  IceCreamDrop_LDFLAGS = $(LDFLAGS)
! IceCreamDrop_CXXFLAGS = -DDATADIR=\"$(prefix)/share/IceCreamDrop/\"
--- 10,12 ----
  IceCreamDrop_LDADD = $(LIBS)
  IceCreamDrop_LDFLAGS = $(LDFLAGS)
! IceCreamDrop_CXXFLAGS = -DICDDATADIR=\"$(prefix)/share/IceCreamDrop/\"

Index: ICDHuman.cpp
===================================================================
RCS file: /cvsroot/smgl/IceCreamDrop/src/ICDHuman.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ICDHuman.cpp	12 Jul 2004 00:49:39 -0000	1.2
--- ICDHuman.cpp	14 Oct 2004 19:57:17 -0000	1.3
***************
*** 35,39 ****
    _shadowTexture = t->createTexture("images/Shadow.png");
  
!   string datadir = DATADIR;
    addAnimation(datadir + "meshes/Skel1_Still.jba", STILL);
    addAnimation(datadir + "meshes/Skel1_Walk.jba", WALK);
--- 35,39 ----
    _shadowTexture = t->createTexture("images/Shadow.png");
  
!   string datadir = ICDDATADIR;
    addAnimation(datadir + "meshes/Skel1_Still.jba", STILL);
    addAnimation(datadir + "meshes/Skel1_Walk.jba", WALK);