[Plib-cvs] plib/src/ssg ssgLoadBGL.cxx,1.10,1.11 ssgLoadBGL.h,1.1,1.2

[J?rgen M. <j_m...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv1413/src/ssg

Modified Files:
	ssgLoadBGL.cxx ssgLoadBGL.h 
Log Message:
fix for Win32 pathnames

Index: ssgLoadBGL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBGL.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ssgLoadBGL.cxx	20 Jul 2002 11:58:20 -0000	1.10
+++ ssgLoadBGL.cxx	20 Jul 2002 19:30:57 -0000	1.11
@@ -94,6 +94,7 @@
 //#define JMDEBUG
 #include "ssgLoadBGL.h"
 #include "ssgLoadMDL.h"
+#include "ssgLoadMDL.h"
 
 
 static ssgLoaderOptions         *current_options;
@@ -1314,7 +1315,7 @@
   }
   // check for path in batch file name
   strcpy(filename, fname);
-  char *p = strrchr(filename,'/');
+  char *p = strrchr(filename, SLASH);
   if ( p != 0) {
     p++;
   }
@@ -1325,8 +1326,8 @@
   models_ = new ssgBranch();
   char* model_name = new char[128];
   char *ptr = (char*)&fname[strlen(fname) - 1];
-  while(ptr != &fname[0] && *ptr != '/') ptr--;
-  if(*ptr == '/') ptr++;
+  while(ptr != &fname[0] && *ptr != SLASH) ptr--;
+  if(*ptr == SLASH) ptr++;
   strcpy(model_name, ptr);
   ptr = &model_name[strlen(model_name)];
   while(*ptr != '.' && ptr != &model_name[0]) ptr--;
@@ -1382,8 +1383,8 @@
   model_ = new ssgBranch();
   char* model_name = new char[128];
   char *ptr = (char*)&fname[strlen(fname) - 1];
-  while(ptr != &fname[0] && *ptr != '/') ptr--;
-  if(*ptr == '/') ptr++;
+  while(ptr != &fname[0] && *ptr != SLASH) ptr--;
+  if(*ptr == SLASH) ptr++;
   strcpy(model_name, ptr);
   ptr = &model_name[strlen(model_name)];
   while(*ptr != '.' && ptr != &model_name[0]) ptr--;

Index: ssgLoadBGL.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBGL.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ssgLoadBGL.h	20 Jul 2002 11:58:20 -0000	1.1
+++ ssgLoadBGL.h	20 Jul 2002 19:30:57 -0000	1.2
@@ -70,6 +70,13 @@
 #define MIN3(a,b,c) ((a) <= (b) ? MIN(a,c) : MIN(b,c))
 #define MAX3(a,b,c) ((a) >= (b) ? MAX(a,c) : MAX(b,c))
 
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define SLASH '\\'
+#else
+#define SLASH '/'
+#endif
+
+
 // type definitions
 
 // class declarations