Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5413 in orxonox.OLD for trunk/src/lib/collision_detection


Ignore:
Timestamp:
Oct 20, 2005, 11:42:08 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: reverted to old revision 5409, removing the LIBTOOL-stuff with command:
svn merge . . -r HEAD:5409

Reason:
Timing:
Default:

real 1m1.111s
user 1m31.534s
sys 0m6.903s

LIBTOOL:

real 2m21.384s
user 3m12.141s
sys 0m36.896s

→ compileTime doubled

Location:
trunk/src/lib/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/Makefile.am

    r5410 r5413  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXcd.la
     4noinst_LIBRARIES = libORXcd.a
    55
    6 libORXcd_la_SOURCES = cd_engine.cc \
    7                       collision.cc \
    8                       obb.cc \
    9                       obb_tree.cc \
    10                       obb_tree_node.cc \
    11                       bv_tree.cc \
    12                       bv_tree_node.cc \
    13                       bounding_volume.cc \
    14                       bounding_sphere.cc
     6libORXcd_a_SOURCES = cd_engine.cc \
     7                     collision.cc \
     8                     obb.cc \
     9                     obb_tree.cc \
     10                     obb_tree_node.cc \
     11                     bv_tree.cc \
     12                     bv_tree_node.cc \
     13                     bounding_volume.cc \
     14                     bounding_sphere.cc
    1515
    1616

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

    r5412 r5413  
    1616
    1717
    18 SOURCES = $(libORXcd_la_SOURCES)
     18SOURCES = $(libORXcd_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
    52 libORXcd_la_LIBADD =
    53 am_libORXcd_la_OBJECTS = cd_engine.lo collision.lo obb.lo obb_tree.lo \
    54         obb_tree_node.lo bv_tree.lo bv_tree_node.lo bounding_volume.lo \
    55         bounding_sphere.lo
    56 libORXcd_la_OBJECTS = $(am_libORXcd_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXcd_a_AR = $(AR) $(ARFLAGS)
     55libORXcd_a_LIBADD =
     56am_libORXcd_a_OBJECTS = cd_engine.$(OBJEXT) collision.$(OBJEXT) \
     57        obb.$(OBJEXT) obb_tree.$(OBJEXT) obb_tree_node.$(OBJEXT) \
     58        bv_tree.$(OBJEXT) bv_tree_node.$(OBJEXT) \
     59        bounding_volume.$(OBJEXT) bounding_sphere.$(OBJEXT)
     60libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
    5761DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5862depcomp = $(SHELL) $(top_srcdir)/depcomp
    5963am__depfiles_maybe = depfiles
    60 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Plo \
    61 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree_node.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/cd_engine.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/collision.Plo ./$(DEPDIR)/obb.Plo \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Plo \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree_node.Plo
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/bv_tree_node.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/cd_engine.Po ./$(DEPDIR)/collision.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/obb.Po ./$(DEPDIR)/obb_tree.Po \
     69@AMDEP_TRUE@    ./$(DEPDIR)/obb_tree_node.Po
    6870CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6971        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    70 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    71         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    72         $(AM_CXXFLAGS) $(CXXFLAGS)
    7372CXXLD = $(CXX)
    74 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    75         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    76 SOURCES = $(libORXcd_la_SOURCES)
    77 DIST_SOURCES = $(libORXcd_la_SOURCES)
     73CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     74        -o $@
     75SOURCES = $(libORXcd_a_SOURCES)
     76DIST_SOURCES = $(libORXcd_a_SOURCES)
    7877HEADERS = $(noinst_HEADERS)
    7978ETAGS = etags
    … …  
    8483AMDEP_TRUE = @AMDEP_TRUE@
    8584AMTAR = @AMTAR@
    86 AR = @AR@
    8785AUTOCONF = @AUTOCONF@
    8886AUTOHEADER = @AUTOHEADER@
    … …  
    9795CURL_LIBS = @CURL_LIBS@
    9896CXX = @CXX@
    99 CXXCPP = @CXXCPP@
    10097CXXDEPMODE = @CXXDEPMODE@
    10198CXXFLAGS = @CXXFLAGS@
    … …  
    109106DOXYGEN_FALSE = @DOXYGEN_FALSE@
    110107DOXYGEN_TRUE = @DOXYGEN_TRUE@
    111 ECHO = @ECHO@
    112108ECHO_C = @ECHO_C@
    113109ECHO_N = @ECHO_N@
    … …  
    115111EGREP = @EGREP@
    116112EXEEXT = @EXEEXT@
    117 F77 = @F77@
    118 FFLAGS = @FFLAGS@
    119113GPROF = @GPROF@
    120114GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    131125LIBOBJS = @LIBOBJS@
    132126LIBS = @LIBS@
    133 LIBTOOL = @LIBTOOL@
    134 LN_S = @LN_S@
    135127LTLIBOBJS = @LTLIBOBJS@
    136128MAKEINFO = @MAKEINFO@
    … …  
    152144SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    153145VERSION = @VERSION@
    154 ac_ct_AR = @ac_ct_AR@
    155146ac_ct_CC = @ac_ct_CC@
    156147ac_ct_CXX = @ac_ct_CXX@
    157 ac_ct_F77 = @ac_ct_F77@
    158148ac_ct_RANLIB = @ac_ct_RANLIB@
    159149ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    198188target_vendor = @target_vendor@
    199189MAINSRCDIR = ../..
    200 noinst_LTLIBRARIES = libORXcd.la
    201 libORXcd_la_SOURCES = cd_engine.cc \
    202                       collision.cc \
    203                       obb.cc \
    204                       obb_tree.cc \
    205                       obb_tree_node.cc \
    206                       bv_tree.cc \
    207                       bv_tree_node.cc \
    208                       bounding_volume.cc \
    209                       bounding_sphere.cc
     190noinst_LIBRARIES = libORXcd.a
     191libORXcd_a_SOURCES = cd_engine.cc \
     192                     collision.cc \
     193                     obb.cc \
     194                     obb_tree.cc \
     195                     obb_tree_node.cc \
     196                     bv_tree.cc \
     197                     bv_tree_node.cc \
     198                     bounding_volume.cc \
     199                     bounding_sphere.cc
    210200
    211201noinst_HEADERS = cd_engine.h \
    … …  
    224214
    225215.SUFFIXES:
    226 .SUFFIXES: .cc .lo .o .obj
     216.SUFFIXES: .cc .o .obj
    227217$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    228218        @for dep in $?; do \
    … …  
    255245        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    256246
    257 clean-noinstLTLIBRARIES:
    258         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    259         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    260           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    261           test "$$dir" != "$$p" || dir=.; \
    262           echo "rm -f \"$${dir}/so_locations\""; \
    263           rm -f "$${dir}/so_locations"; \
    264         done
    265 libORXcd.la: $(libORXcd_la_OBJECTS) $(libORXcd_la_DEPENDENCIES)
    266         $(CXXLINK)  $(libORXcd_la_LDFLAGS) $(libORXcd_la_OBJECTS) $(libORXcd_la_LIBADD) $(LIBS)
     247clean-noinstLIBRARIES:
     248        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     249libORXcd.a: $(libORXcd_a_OBJECTS) $(libORXcd_a_DEPENDENCIES)
     250        -rm -f libORXcd.a
     251        $(libORXcd_a_AR) libORXcd.a $(libORXcd_a_OBJECTS) $(libORXcd_a_LIBADD)
     252        $(RANLIB) libORXcd.a
    267253
    268254mostlyclean-compile:
    … …  
    272258        -rm -f *.tab.c
    273259
    274 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Plo@am__quote@
    275 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Plo@am__quote@
    276 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Plo@am__quote@
    277 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Plo@am__quote@
    278 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Plo@am__quote@
    279 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Plo@am__quote@
    280 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Plo@am__quote@
    281 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Plo@am__quote@
    282 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Plo@am__quote@
     260@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
     261@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
     262@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
     263@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree_node.Po@am__quote@
     264@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
     265@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
     266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
     267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
     268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree_node.Po@am__quote@
    283269
    284270.cc.o:
    … …  
    297283@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    298284@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    299 
    300 .cc.lo:
    301 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    302 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    303 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    304 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    306 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    307 
    308 mostlyclean-libtool:
    309         -rm -f *.lo
    310 
    311 clean-libtool:
    312         -rm -rf .libs _libs
    313 
    314 distclean-libtool:
    315         -rm -f libtool
    316285uninstall-info-am:
    317286
    … …  
    393362check-am: all-am
    394363check: check-am
    395 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     364all-am: Makefile $(LIBRARIES) $(HEADERS)
    396365installdirs:
    397366install: install-am
    … …  
    421390clean: clean-am
    422391
    423 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    424         mostlyclean-am
     392clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    425393
    426394distclean: distclean-am
    … …  
    428396        -rm -f Makefile
    429397distclean-am: clean-am distclean-compile distclean-generic \
    430         distclean-libtool distclean-tags
     398        distclean-tags
    431399
    432400dvi: dvi-am
    … …  
    457425mostlyclean: mostlyclean-am
    458426
    459 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    460         mostlyclean-libtool
     427mostlyclean-am: mostlyclean-compile mostlyclean-generic
    461428
    462429pdf: pdf-am
    … …  
    471438
    472439.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    473         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
    474         distclean-compile distclean-generic distclean-libtool \
    475         distclean-tags distdir dvi dvi-am html html-am info info-am \
    476         install install-am install-data install-data-am install-exec \
    477         install-exec-am install-info install-info-am install-man \
    478         install-strip installcheck installcheck-am installdirs \
    479         maintainer-clean maintainer-clean-generic mostlyclean \
    480         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    481         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    482         uninstall-info-am
     440        clean-noinstLIBRARIES ctags distclean distclean-compile \
     441        distclean-generic distclean-tags distdir dvi dvi-am html \
     442        html-am info info-am install install-am install-data \
     443        install-data-am install-exec install-exec-am install-info \
     444        install-info-am install-man install-strip installcheck \
     445        installcheck-am installdirs maintainer-clean \
     446        maintainer-clean-generic mostlyclean mostlyclean-compile \
     447        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     448        uninstall-am uninstall-info-am
    483449
    484450include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.