Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2992 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Nov 26, 2004, 10:03:01 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/osX: merged back from trunk again. command: svn merge trunk/ branches/osX/ -r 2977:HEAD. All conflicts resolved in favor of trunk.

Location:
orxonox/branches/osX/importer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/osX/importer/Makefile.in

    r2985 r2992  
    1 # Makefile.in generated by automake 1.7.6 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    5 # Free Software Foundation, Inc.
     4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     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,
    … …  
    1414
    1515@SET_MAKE@
     16
     17
     18SOURCES = $(importer_SOURCES)
    1619
    1720srcdir = @srcdir@
    … …  
    2225pkgincludedir = $(includedir)/@PACKAGE@
    2326top_builddir = ..
    24 
    2527am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2628INSTALL = @INSTALL@
    … …  
    3739POST_UNINSTALL = :
    3840host_triplet = @host@
     41bin_PROGRAMS = importer$(EXEEXT)
     42subdir = importer
     43DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
     44        $(srcdir)/Makefile.in
     45ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     46am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     47am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
     48        $(ACLOCAL_M4)
     49mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
     50CONFIG_HEADER = $(top_builddir)/config.h
     51CONFIG_CLEAN_FILES =
     52am__installdirs = "$(DESTDIR)$(bindir)"
     53binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     54PROGRAMS = $(bin_PROGRAMS)
     55am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
     56        vector.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
     57        material.$(OBJEXT)
     58importer_OBJECTS = $(am_importer_OBJECTS)
     59importer_LDADD = $(LDADD)
     60DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
     61depcomp = $(SHELL) $(top_srcdir)/depcomp
     62am__depfiles_maybe = depfiles
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
     66CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     67        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     68CXXLD = $(CXX)
     69CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     70        -o $@
     71SOURCES = $(importer_SOURCES)
     72DIST_SOURCES = $(importer_SOURCES)
     73HEADERS = $(noinst_HEADERS)
     74ETAGS = etags
     75CTAGS = ctags
     76DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    3977ACLOCAL = @ACLOCAL@
    4078AMDEP_FALSE = @AMDEP_FALSE@
    … …  
    121159localstatedir = @localstatedir@
    122160mandir = @mandir@
     161mkdir_p = @mkdir_p@
    123162oldincludedir = @oldincludedir@
    124163prefix = @prefix@
    … …  
    134173AM_CXXFLAGS = "-I/usr/X11R6/include"
    135174AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
    136 
    137 
    138 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
    139 bin_PROGRAMS = importer
    140175importer_SOURCES = framework.cc windowHandler.cc vector.cc object.cc array.cc material.cc
    141 
    142176noinst_HEADERS = framework.h windowHandler.h  vector.h object.h array.h material.h
    143 subdir = importer
    144 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    145 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    146 CONFIG_HEADER = $(top_builddir)/config.h
    147 CONFIG_CLEAN_FILES =
    148 bin_PROGRAMS = importer$(EXEEXT)
    149 PROGRAMS = $(bin_PROGRAMS)
    150 
    151 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
    152         vector.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
    153         material.$(OBJEXT)
    154 importer_OBJECTS = $(am_importer_OBJECTS)
    155 importer_LDADD = $(LDADD)
    156 importer_DEPENDENCIES =
    157 importer_LDFLAGS =
    158 
    159 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
    160 depcomp = $(SHELL) $(top_srcdir)/depcomp
    161 am__depfiles_maybe = depfiles
    162 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
    163 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
    164 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
    165 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    166         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    167 CXXLD = $(CXX)
    168 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    169         -o $@
    170 DIST_SOURCES = $(importer_SOURCES)
    171 HEADERS = $(noinst_HEADERS)
    172 
    173 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO
    174 SOURCES = $(importer_SOURCES)
    175 
    176177all: all-am
    177178
    178179.SUFFIXES:
    179180.SUFFIXES: .cc .o .obj
    180 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
     181$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
     182        @for dep in $?; do \
     183          case '$(am__configure_deps)' in \
     184            *$$dep*) \
     185              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
     186                && exit 0; \
     187              exit 1;; \
     188          esac; \
     189        done; \
     190        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  importer/Makefile'; \
    181191        cd $(top_srcdir) && \
    182192          $(AUTOMAKE) --gnu  importer/Makefile
    183 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
    184         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
    185 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     193.PRECIOUS: Makefile
     194Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     195        @case '$?' in \
     196          *config.status*) \
     197            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
     198          *) \
     199            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
     200            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
     201        esac;
     202
     203$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     204        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     205
     206$(top_srcdir)/configure:  $(am__configure_deps)
     207        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     208$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
     209        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    186210install-binPROGRAMS: $(bin_PROGRAMS)
    187211        @$(NORMAL_INSTALL)
    188         $(mkinstalldirs) $(DESTDIR)$(bindir)
     212        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    189213        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    190214          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    192216          ; then \
    193217            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    194            echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    195            $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     218           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     219           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    196220          else :; fi; \
    197221        done
    … …  
    201225        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    202226          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    203           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    204           rm -f $(DESTDIR)$(bindir)/$$f; \
     227          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     228          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    205229        done
    206230
    … …  
    212236
    213237mostlyclean-compile:
    214         -rm -f *.$(OBJEXT) core *.core
     238        -rm -f *.$(OBJEXT)
    215239
    216240distclean-compile:
    … …  
    224248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@
    225249
    226 distclean-depend:
    227         -rm -rf ./$(DEPDIR)
    228 
    229250.cc.o:
    230 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
    231 @am__fastdepCXX_TRUE@     -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
    232 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
    233 @am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
    234 @am__fastdepCXX_TRUE@   fi
     251@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     252@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    235253@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    236254@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    237255@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    238 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
     256@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
    239257
    240258.cc.obj:
    241 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
    242 @am__fastdepCXX_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
    243 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
    244 @am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
    245 @am__fastdepCXX_TRUE@   fi
     259@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     260@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    246261@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    247262@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
    248263@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    249 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
     264@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    250265uninstall-info-am:
    251 
    252 ETAGS = etags
    253 ETAGSFLAGS =
    254 
    255 CTAGS = ctags
    256 CTAGSFLAGS =
    257 
    258 tags: TAGS
    259266
    260267ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    … …  
    266273               END { for (i in files) print i; }'`; \
    267274        mkid -fID $$unique
     275tags: TAGS
    268276
    269277TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    277285          $(AWK) '    { files[$$0] = 1; } \
    278286               END { for (i in files) print i; }'`; \
    279         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    280           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    281              $$tags $$unique
    282 
     287        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     288          test -n "$$unique" || unique=$$empty_fix; \
     289          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     290            $$tags $$unique; \
     291        fi
    283292ctags: CTAGS
    284293CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    … …  
    303312distclean-tags:
    304313        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    305 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    306 
    307 top_distdir = ..
    308 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
    309314
    310315distdir: $(DISTFILES)
    … …  
    320325          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
    321326            dir="/$$dir"; \
    322             $(mkinstalldirs) "$(distdir)$$dir"; \
     327            $(mkdir_p) "$(distdir)$$dir"; \
    323328          else \
    324329            dir=''; \
    … …  
    338343check: check-am
    339344all-am: Makefile $(PROGRAMS) $(HEADERS)
    340 
    341345installdirs:
    342         $(mkinstalldirs) $(DESTDIR)$(bindir)
     346        for dir in "$(DESTDIR)$(bindir)"; do \
     347          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     348        done
    343349install: install-am
    344350install-exec: install-exec-am
    … …  
    352358install-strip:
    353359        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
    354           INSTALL_STRIP_FLAG=-s \
     360          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
    355361          `test -z '$(STRIP)' || \
    356362            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
    … …  
    360366
    361367distclean-generic:
    362         -rm -f Makefile $(CONFIG_CLEAN_FILES)
     368        -rm -f $(CONFIG_CLEAN_FILES)
    363369
    364370maintainer-clean-generic:
    … …  
    370376
    371377distclean: distclean-am
    372 
    373 distclean-am: clean-am distclean-compile distclean-depend \
    374         distclean-generic distclean-tags
     378        -rm -rf ./$(DEPDIR)
     379        -rm -f Makefile
     380distclean-am: clean-am distclean-compile distclean-generic \
     381        distclean-tags
    375382
    376383dvi: dvi-am
    … …  
    378385dvi-am:
    379386
     387html: html-am
     388
    380389info: info-am
    381390
    … …  
    393402
    394403maintainer-clean: maintainer-clean-am
    395 
     404        -rm -rf ./$(DEPDIR)
     405        -rm -f Makefile
    396406maintainer-clean-am: distclean-am maintainer-clean-generic
    397407
    … …  
    412422.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    413423        clean-generic ctags distclean distclean-compile \
    414         distclean-depend distclean-generic distclean-tags distdir dvi \
    415         dvi-am info info-am install install-am install-binPROGRAMS \
     424        distclean-generic distclean-tags distdir dvi dvi-am html \
     425        html-am info info-am install install-am install-binPROGRAMS \
    416426        install-data install-data-am install-exec install-exec-am \
    417427        install-info install-info-am install-man install-strip \

  • orxonox/branches/osX/importer/framework.cc

    r2977 r2992  
    4343  // Create a new OpenGL window with the title "Cone3D Basecode" at
    4444  // 640x480x32, fullscreen and check for errors along the way
    45   if(wHandler.CreateGLWindow("Whandler Basecode", 500, 375, 32, FALSE) == FALSE)
     45  if(wHandler.CreateGLWindow("Whandler Basecode", 640, 480, 32, FALSE) == FALSE)
    4646  {
    4747    // If an error is found, display a message, kill the GL and SDL screens (if they were created) and exit

  • orxonox/branches/osX/importer/object.cc

    r2977 r2992  
    226226  group->faceMode = -1;
    227227  group->faceCount = 0; 
     228  group->nextGroup = NULL;
    228229  if ((group->listNumber = glGenLists(1)) == 0 )
    229230    {
Note: See TracChangeset for help on using the changeset viewer.