Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5672 in orxonox.OLD for trunk/src/lib/graphics


Ignore:
Timestamp:
Nov 21, 2005, 3:59:28 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: removed the modelinfo from the includes of vector.h

Location:
trunk/src/lib/graphics
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/Makefile.in

    r5479 r5672  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004, 2005  Free Software Foundation, Inc.
     5# 2003, 2004  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXgraphics_a_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    3638PRE_UNINSTALL = :
    3739POST_UNINSTALL = :
    38 build_triplet = @build@
    3940host_triplet = @host@
    40 target_triplet = @target@
    4141subdir = src/lib/graphics
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6262depcomp = $(SHELL) $(top_srcdir)/depcomp
    6363am__depfiles_maybe = depfiles
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Po ./$(DEPDIR)/font.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/render_2d.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/shader.Po ./$(DEPDIR)/text.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po
    6469CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6570        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    274279@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    275280@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    276 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     281@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     282@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    277283@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    278284
    … …  
    281287@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    282288@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    283 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     289@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     290@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    284291@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    285292
    … …  
    288295@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    289296@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.o' libtool=no @AMDEPBACKSLASH@
    290 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     297@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
     298@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    291299@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc
    292300
    … …  
    295303@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    296304@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.obj' libtool=no @AMDEPBACKSLASH@
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     305@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
     306@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    298307@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`
    299308
    … …  
    302311@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    303312@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.o' libtool=no @AMDEPBACKSLASH@
    304 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     313@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
     314@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    305315@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc
    306316
    … …  
    309319@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    310320@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.obj' libtool=no @AMDEPBACKSLASH@
    311 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     321@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
     322@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    312323@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`
    313324
    … …  
    316327@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    317328@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
    318 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     329@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     330@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    319331@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc
    320332
    … …  
    323335@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    324336@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
    325 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
     338@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    326339@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`
    327340
    … …  
    330343@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    331344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.o' libtool=no @AMDEPBACKSLASH@
    332 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     345@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
     346@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    333347@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc
    334348
    … …  
    337351@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    338352@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.obj' libtool=no @AMDEPBACKSLASH@
    339 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     353@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
     354@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    340355@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`
    341356
    … …  
    344359@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    345360@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.o' libtool=no @AMDEPBACKSLASH@
    346 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     361@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
     362@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    347363@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc
    348364
    … …  
    351367@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    352368@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.obj' libtool=no @AMDEPBACKSLASH@
    353 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     369@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
     370@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    354371@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`
    355372uninstall-info-am:
    … …  
    362379# (2) otherwise, pass the desired values on the `make' command line.
    363380$(RECURSIVE_TARGETS):
    364         @failcom='exit 1'; \
    365         for f in x $$MAKEFLAGS; do \
    366           case $$f in \
    367             *=* | --[!k]*);; \
    368             *k*) failcom='fail=yes';; \
    369           esac; \
    370         done; \
     381        @set fnord $$MAKEFLAGS; amf=$$2; \
    371382        dot_seen=no; \
    372383        target=`echo $@ | sed s/-recursive//`; \
    … …  
    380391          fi; \
    381392          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    382           || eval $$failcom; \
     393           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
    383394        done; \
    384395        if test "$$dot_seen" = "no"; then \
    … …  
    388399mostlyclean-recursive clean-recursive distclean-recursive \
    389400maintainer-clean-recursive:
    390         @failcom='exit 1'; \
    391         for f in x $$MAKEFLAGS; do \
    392           case $$f in \
    393             *=* | --[!k]*);; \
    394             *k*) failcom='fail=yes';; \
    395           esac; \
    396         done; \
     401        @set fnord $$MAKEFLAGS; amf=$$2; \
    397402        dot_seen=no; \
    398403        case "$@" in \
    … …  
    415420          fi; \
    416421          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    417           || eval $$failcom; \
     422           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
    418423        done && test -z "$$fail"
    419424tags-recursive:
    … …  
    515520          fi; \
    516521        done
    517         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     522        list='$(SUBDIRS)'; for subdir in $$list; do \
    518523          if test "$$subdir" = .; then :; else \
    519524            test -d "$(distdir)/$$subdir" \
    520             || $(mkdir_p) "$(distdir)/$$subdir" \
     525            || mkdir "$(distdir)/$$subdir" \
    521526            || exit 1; \
    522             distdir=`$(am__cd) $(distdir) && pwd`; \
    523             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    524527            (cd $$subdir && \
    525528              $(MAKE) $(AM_MAKEFLAGS) \
    526                 top_distdir="$$top_distdir" \
    527                 distdir="$$distdir/$$subdir" \
     529                top_distdir="../$(top_distdir)" \
     530                distdir="../$(distdir)/$$subdir" \
    528531                distdir) \
    529532              || exit 1; \
    … …  
    554557
    555558distclean-generic:
    556         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     559        -rm -f $(CONFIG_CLEAN_FILES)
    557560
    558561maintainer-clean-generic:

  • trunk/src/lib/graphics/importer/Makefile.in

    r5479 r5672  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004, 2005  Free Software Foundation, Inc.
     5# 2003, 2004  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXimporter_a_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    3638PRE_UNINSTALL = :
    3739POST_UNINSTALL = :
    38 build_triplet = @build@
    3940host_triplet = @host@
    40 target_triplet = @target@
    4141subdir = src/lib/graphics/importer
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6161depcomp = $(SHELL) $(top_srcdir)/depcomp
    6262am__depfiles_maybe = depfiles
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
    6368CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6469        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    259264@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    260265@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    261 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    262268@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    263269
    … …  
    266272@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    267273@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    268 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     274@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    269276@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    270277uninstall-info-am:
    … …  
    368375
    369376distclean-generic:
    370         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     377        -rm -f $(CONFIG_CLEAN_FILES)
    371378
    372379maintainer-clean-generic:

  • trunk/src/lib/graphics/importer/abstract_model.h

    r5435 r5672  
    2323
    2424#include "base_object.h"
    25 
     25#include "vector.h"
    2626
    2727using namespace std;
    2828
    29 class Quadtree;
    30 
    31 
    32 //! this is a small and performant 3D vector
    33 typedef float sVec3D[3];
    34 
    35 
    36 //! small and performant 2D vector
    37 typedef float sVec2D[2];
    3829
    3930

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5479 r5672  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004, 2005  Free Software Foundation, Inc.
     5# 2003, 2004  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515@SET_MAKE@
    1616
     17
     18SOURCES = $(libORXquadtree_a_SOURCES)
    1719
    1820srcdir = @srcdir@
    … …  
    3638PRE_UNINSTALL = :
    3739POST_UNINSTALL = :
    38 build_triplet = @build@
    3940host_triplet = @host@
    40 target_triplet = @target@
    4141subdir = src/lib/graphics/spatial_separation
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    6060depcomp = $(SHELL) $(top_srcdir)/depcomp
    6161am__depfiles_maybe = depfiles
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6265CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6366        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    246249@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    247250@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    248 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     251@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     252@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    249253@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    250254
    … …  
    253257@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    254258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    255 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     259@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     260@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    256261@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    257262uninstall-info-am:
    … …  
    355360
    356361distclean-generic:
    357         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     362        -rm -f $(CONFIG_CLEAN_FILES)
    358363
    359364maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.