FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Irix tweaks.

Browse Source
This commit is contained in:
curt 2001-04-11 21:14:24 +00:00
parent e3b0a70eb9
commit dfbcb1566b
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.in
View File

@ -34,6 +34,18 @@ AC_PROG_RANLIB
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
OS=`uname -s`
if test $OS = "IRIX" -o $OS = "IRIX64"; then
if text $CC = "CC"; then
AR="CC -ar"
else
AR="ar"
fi
else
AR="ar"
fi
AC_SUBST(AR)
if echo $includedir | egrep "simgear$" > /dev/null; then if echo $includedir | egrep "simgear$" > /dev/null; then
echo "includedir is" $includedir "libdir is" $libdir echo "includedir is" $includedir "libdir is" $libdir
else else

5
simgear/Makefile.am
View File

@ -31,6 +31,7 @@ include_HEADERS = \
compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
SUBDIRS = \ SUBDIRS = \
$(ZLIB_DIRS) \
bucket \ bucket \
debug \ debug \
ephemeris \ ephemeris \
@ -46,5 +47,5 @@ SUBDIRS = \
sky \ sky \
$(SGTHREAD_DIR) \ $(SGTHREAD_DIR) \
timing \ timing \
xgl \ xgl
$(ZLIB_DIRS)

3
simgear/misc/props_io.cxx
View File

@ -7,6 +7,7 @@
#include <stdlib.h> // atof() atoi() #include <stdlib.h> // atof() atoi()
#include <simgear/sg_inlines.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/xml/easyxml.hxx> #include <simgear/xml/easyxml.hxx>
@ -126,7 +127,7 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
int index = 0; int index = 0;
if (att_n != 0) { if (att_n != 0) {
index = atoi(att_n); index = atoi(att_n);
st.counters[name] = max(st.counters[name], index+1); st.counters[name] = SG_MAX2(st.counters[name], index+1);
} else { } else {
index = st.counters[name]; index = st.counters[name];
st.counters[name]++; st.counters[name]++;

11
simgear/threads/SGThread.hxx
View File

@ -23,9 +23,16 @@
#ifndef SGTHREAD_HXX_INCLUDED #ifndef SGTHREAD_HXX_INCLUDED
#define SGTHREAD_HXX_INCLUDED 1 #define SGTHREAD_HXX_INCLUDED 1
#include <simgear/compiler.h>
#include <pthread.h> #include <pthread.h>
#include <cassert> #if defined ( SG_HAVE_STD_INCLUDES )
#include <cerrno> # include <cassert>
# include <cerrno>
#else
# include <assert.h>
# include <sys/errno.h>
#endif
class SGThread; class SGThread;