Changeset 3703 in orxonox.OLD

Timestamp:

Mar 31, 2005, 10:59:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: orxonox compiles under Windows again
@patrick: i had to disable benchMark in orxonox.cc (with #ifndef WIN32) see for yourself

Location:

orxonox/branches/textEngine

Files:

• configure.ac (modified) (2 diffs)
• src/lib/util/resource_manager.cc (modified) (2 diffs)
• src/orxonox.cc (modified) (2 diffs)

orxonox/branches/textEngine/configure.ac

@@ -213 +213 @@
 echo "mingw-WINDOWS detected"
 
+CPPFLAGS="-I/usr/include/SDL -I/mingw/include/SDL"
+
     mingw="yes"
     MSBITFIELDS="-mms-bitfields"
@@ -257 +259 @@
     fi
 # checking for SDL-headers
-    AC_CHECK_HEADERS([SDL/SDL.h] ,,
+    AC_CHECK_HEADERS([SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 

orxonox/branches/textEngine/src/lib/util/resource_manager.cc

@@ -396 +396 @@
   struct stat status;
   stat(directoryName, &status);
-  if (status.st_mode & (S_IFDIR | S_IFLNK))
+  if (status.st_mode & (S_IFDIR 
+#ifndef __WIN32__
+                        | S_IFLNK
+#endif
+                        ))
     return true;
   else
@@ -411 +415 @@
   struct stat status;
   stat(fileName, &status);
-  if (status.st_mode & (S_IFREG | S_IFLNK))
+  if (status.st_mode & (S_IFREG 
+#ifndef __WIN32__
+                        | S_IFLNK
+#endif
+                        ))
     return true;
   else

orxonox/branches/textEngine/src/orxonox.cc

@@ -339 +339 @@
 }
 
+#ifndef __WIN32__
 
 #include "list.h"
@@ -732 +733 @@
   
 }
+
+#else /* __WIN32__ */
+int startBenchmarks()
+{
+  PRINTF(1)("Not supported in WIN32 yet\n");
+}
+#endif