Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4653 in orxonox.OLD for orxonox/trunk/src/subprojects/importer


Ignore:
Timestamp:
Jun 18, 2005, 2:44:14 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: still a strange bug in the TYPE-case of the resource manager…
temporarily fixed the importer

Location:
orxonox/trunk/src/subprojects/importer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/subprojects/importer/Makefile.am

    r4637 r4653  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 importer_CPPFLAGS = -DNO_AUDIO
     4importer_CPPFLAGS =
    55
    66importer_LDFLAGS = $(MWINDOWS)
    … …  
    1010importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
    1111                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     12                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
    1213                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
    1314

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4639 r4653  
    6363importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \
    6464        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     65        $(MAINSRCDIR)/lib/sound/libORXsound.a \
    6566        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
    6667DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    … …  
    201202target_vendor = @target_vendor@
    202203MAINSRCDIR = ../..
    203 importer_CPPFLAGS = -DNO_AUDIO
     204importer_CPPFLAGS =
    204205importer_LDFLAGS = $(MWINDOWS)
    205206importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
    206207                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     208                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
    207209                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
    208210

  • orxonox/trunk/src/subprojects/importer/importer.cc

    r4649 r4653  
    3232  ResourceManager::getInstance()->addImageDir("./");
    3333
     34  for (int i = 0; i < argc; i++)
     35  {
     36    printf("%s\n", argv[i]);
     37  }
     38  ResourceManager::getInstance()->addImageDir("");
     39
     40
    3441  if (argc>=3)
    3542    obj = new OBJModel (argv[1], atof(argv[2]));
    … …  
    3845  else
    3946    obj = new PrimitiveModel(PRIM_CYLINDER);
     47
     48  ResourceManager::getInstance()->debug();
    4049
    4150  LightManager* lightMan = LightManager::getInstance();
Note: See TracChangeset for help on using the changeset viewer.