Changeset 9391 in orxonox.OLD for trunk

Timestamp:

Jul 23, 2006, 2:41:44 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles perfectly on windows from here
had to: switch from AC_PREFQ(2.59 → 2.56)
reinvent the lua-lib-stuff, as including liblua in liblualib is mandatory in f windows
remove some unportable line in the md3_animation
@patrick: please can you have a look at md3-animation, the part i have commented out is most possibly the whole readin process

Location:

trunk

Files:

• acinclude.m4 (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• src/lib/graphics/importer/md3/md3_animation_cfg.cc (modified) (2 diffs)

trunk/acinclude.m4

@@ -282 +282 @@
      [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"  AX_CHECK_REQUIRED_HEADER_LIB([lualib.h], [lualib lualib50], [luaopen_base],
 dnl liblualib found
-      [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"],,
-      [http://www.lua.org],, [${LUA_LIBS} -ldl -lm])],
+      [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"], [LUA_LIBS="${LUA_LIBS} -llualib"],
+      [http://www.lua.org],, [-llua ${LUA_LIBS} -ldl -lm])],
 dnl liblua not found (download it)
        [AX_GET_INSTALL_NECESSARY_LIB([http://switch.dl.sourceforge.net/sourceforge/gtksql], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])

trunk/configure.ac

@@ -28 +28 @@
 ## AUTOCONF INIT PHASE ##
 #########################
-AC_PREREQ(2.59)
+AC_PREREQ(2.56)
 AC_INIT([orxonox], [0.3.5_alpha], [orxonox-dev at mail.datacore.ch])
 
@@ -604 +604 @@
 AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
 
+
+ AX_CHECK_REQUIRED_HEADER_LIB([zlib.h], [z], [zlibVersion],,, [http://www.zlib.net])
+ AX_CHECK_REQUIRED_HEADER_LIB([math.h], [m], [sqrt])
+
+
 #-----#
 # LUA #
@@ -619 +624 @@
    fi
 fi
-
-# FIXME: Replace `main' with a function in `-lm':
- AX_CHECK_REQUIRED_HEADER_LIB([math.h], [m], [sqrt])
- AX_CHECK_REQUIRED_HEADER_LIB([zlib.h], [z], [zlibVersion],,, [http://www.zlib.net])
 
 # Checks for header files.

trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc

@@ -87 +87 @@
 
     // parse file
-    while( (read = getline(&cLine, &len, pFile)) != -1) { /*( !this->dataStream.eof()) {*/
+    /// @FIXME FIXME bensch took this out, cause: not portable
+      //    while( (read = getline(&cLine, &len, pFile)) != -1) { /*( !this->dataStream.eof()) {*/
+      /*
       std::string line(cLine);
 
@@ -175 +177 @@
           this->putAnimation(animation);
         }
-      }
+        }
     }
+      */
   }