Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 9, 2005, 11:29:19 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:
orxonox/branches/heightMap
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/src/subprojects/testmain/Makefile.in

    r4090 r4122  
    1 # Makefile.in generated by automake 1.9.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
    40 build_triplet = @build@
    4140host_triplet = @host@
    42 target_triplet = @target@
    4341bin_PROGRAMS = testmain$(EXEEXT)
    4442subdir = src/subprojects/testmain
    … …  
    6159depcomp = $(SHELL) $(top_srcdir)/depcomp
    6260am__depfiles_maybe = depfiles
     61@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testmain.Po
    6362CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6463        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    105104EXEEXT = @EXEEXT@
    106105GPROF = @GPROF@
    107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    108 GTHREAD_LIBS = @GTHREAD_LIBS@
    109106GTK2_CFLAGS = @GTK2_CFLAGS@
    110107GTK2_LIBS = @GTK2_LIBS@
    111108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    112109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    115110HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    116111HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    133128PACKAGE_VERSION = @PACKAGE_VERSION@
    134129PATH_SEPARATOR = @PATH_SEPARATOR@
     130RANLIB = @RANLIB@
    135131SET_MAKE = @SET_MAKE@
    136132SHELL = @SHELL@
    … …  
    141137ac_ct_CC = @ac_ct_CC@
    142138ac_ct_CXX = @ac_ct_CXX@
     139ac_ct_RANLIB = @ac_ct_RANLIB@
    143140ac_ct_STRIP = @ac_ct_STRIP@
    144141am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    149146am__leading_dot = @am__leading_dot@
    150147am__quote = @am__quote@
    151 am__tar = @am__tar@
    152 am__untar = @am__untar@
    153148bindir = @bindir@
    154149build = @build@
    … …  
    184179target_vendor = @target_vendor@
    185180MAINSRCDIR = ../..
    186 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities \
    187         -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib \
    188         -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics \
    189         -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang \
    190         -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math \
    191         -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font \
    192         -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu \
    193         -I$(MAINSRCDIR)/ai
     181AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    194182AM_LDFLAGS = $(MWINDOWS)
    195183testmain_SOURCES = testmain.cc
    … …  
    267255@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    268256@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    269 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     257@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    270259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    271260
    … …  
    274263@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    275264@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    276 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     265@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    277267@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    278268uninstall-info-am:
    … …  
    379369
    380370distclean-generic:
    381         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     371        -rm -f $(CONFIG_CLEAN_FILES)
    382372
    383373maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.