Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7268 in orxonox.OLD for branches


Ignore:
Timestamp:
Apr 2, 2006, 5:54:55 PM (19 years ago)
Author:
bensch
Message:

shared_lib, ok loading everything (strangely npc is not a default dependency for orxonox, nowhere is it referenced… (but in NPC's)

Location:
branches/shared_lib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/shared_lib/src/orxonox.cc

    r7267 r7268  
    343343
    344344
    345   if (!DynamicLoader::addSearchDirRelative("./world_entities/libs"))
    346     if (!DynamicLoader::addSearchDirRelative("./src/world_entities/libs"))
     345  if (!DynamicLoader::addSearchDirRelative("./world_entities/.libs"))
     346    if (!DynamicLoader::addSearchDirRelative("./src/world_entities/.libs"))
    347347      DynamicLoader::addSearchDir(PKG_LIBDIR);
    348348
    … …  
    356356  DynamicLoader::loadDyLib("libORXenvironmentals.la");
    357357
     358  DynamicLoader::loadDyLib("libORXmisc_entities.la");
    358359  DynamicLoader::loadDyLib("libORXnpcs.la");
    359 
    360   DynamicLoader::loadDyLib("libORXmisc_entities.la");
    361360  printf("%s\n", DynamicLoader::getSearchDir());
    362361

  • branches/shared_lib/src/world_entities/Makefile.am

    r7264 r7268  
    1616                player.cc \
    1717                \
    18                 npcs/npc.cc \
    1918                \
    2019                weapons/weapon_manager.cc \
    … …  
    3938                \
    4039                $(WRONG_SORTED_SOURCES_)
     40
     41#               npcs/npc.cc
    4142
    4243LDFLAGS = --export-dynamic -module
    … …  
    8485
    8586libORXnpcs_la_SOURCES = \
     87                npcs/npc.cc \
    8688                npcs/ground_turret.cc \
    8789                npcs/npc_test.cc \
Note: See TracChangeset for help on using the changeset viewer.