Changeset 8523 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 16, 2006, 11:16:38 AM (19 years ago)

Author:

bensch

Message:

trunk: compiles on Windows: DANGER: THE LINUX PORT MAY BE COMPROMISED

Location:

trunk/src/lib

Files:

• graphics/effects/volfog_effect.cc (modified) (2 diffs)
• util/filesys/directory.cc (modified) (2 diffs)

trunk/src/lib/graphics/effects/volfog_effect.cc

@@ -25 +25 @@
 
 #define GLX_GLXEXT_PROTOTYPES
-#include <GL/glx.h>
+//#include <GL/glx.h>
 // #include <GL/glut.h>
 
@@ -90 +90 @@
 
 
-    glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
+    /*    glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
     glFogCoordfvEXT      = (PFNGLFOGCOORDFVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfvEXT");
     glFogCoorddEXT       = (PFNGLFOGCOORDDEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoorddEXT");
     glFogCoorddvEXT      = (PFNGLFOGCOORDDVEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoorddvEXT");
     glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordPointerEXT");
-
+    */
     // set the fog attributes
     glFogf (GL_FOG_START,  fogStart);

trunk/src/lib/util/filesys/directory.cc

@@ -99 +99 @@
     return false;
   }
+
+  dirent* entry;
+  while ((entry = readdir(handle)) != NULL)
+    this->_fileNames.push_back(entry->d_name);
+  closedir(handle);
+
 #else
   HANDLE handle;
@@ -124 +130 @@
     this->_fileNames.push_back(entry.cFileName);
   }
-#endif
-
-  // BUILDING the list of contained Files. (only the names)
-#if not defined(__WIN32__)
-  dirent* entry;
-  while ((entry = readdir(handle)) != NULL)
-    this->_fileNames.push_back(entry->d_name);
-  closedir(handle);
-#else
-  WIN32_FIND_DATA entry;
-  while ((int ok = FindNextFile(handle, &entry)) != 0)
+  int ok;
+  while ((ok = FindNextFile(handle, &entry)) != 0)
     this->_fileNames.push_back(entry.cFileName);
   FindClose(handle);
-#endif
+#endif /* __WIN_32__ */
+
   this->_opened = true;
   return true;