Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7175 in orxonox.OLD


Ignore:
Timestamp:
Feb 21, 2006, 11:20:53 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: now the PKG-libdir should be eaten too

Location:
branches/shared_lib/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/shared_lib/src/Makefile.am

    r7174 r7175  
    1212bin_PROGRAMS = orxonox
    1313
    14 orxonox_CPPFLAGS = -DIS_ORXONOX
     14orxonox_CPPFLAGS = -DIS_ORXONOX -DPKG_LIBDIR="\"$(pkglibdir)\""
    1515orxonox_LDFLAGS = -ldl -rdynamic
    1616

  • branches/shared_lib/src/orxonox.cc

    r7174 r7175  
    335335  DynamicLoader::addSearchDirRelative("./world_entities");
    336336  DynamicLoader::addSearchDirRelative("./src/world_entities");
    337 
     337  DynamicLoader::addSearchDir(PKG_LIBDIR);
    338338  DynamicLoader::loadDyLib("libORXground_turret");
    339339

  • branches/shared_lib/src/util/loading/dynamic_loader.cc

    r7174 r7175  
    113113}
    114114
     115bool DynamicLoader::addSearchDirInLibDir(const char* relSearchDir)
     116{
     117
     118}
     119
    115120
    116121const char* DynamicLoader::getSearchDir()

  • branches/shared_lib/src/util/loading/dynamic_loader.h

    r7174 r7175  
    2828  static void addSearchDir(const char* searchDir);
    2929  static bool addSearchDirRelative(const char* relSearchDir);
     30  static bool addSearchDirInLibDir(const char* relSearchDir);
    3031  static const char* getSearchDir();
    3132

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

    r7174 r7175  
    11MAINSRCDIR=..
    22include $(MAINSRCDIR)/defs/include_paths.am
    3 # include WorldEntities.am
     3include WorldEntities.am
    44
    55noinst_LIBRARIES = libORXwe.a
     6pkglib_LTLIBRARIES = libORXground_turret.la
     7libORXground_turret_la_SOURCES = npcs/ground_turret.cc
    68
    79## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES

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

    r7174 r7175  
    11## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
    2 
    3 pkglib_LTLIBRARIES = libORXground_turret.la
    4 libORXground_turret_la_SOURCES = world_entities/npcs/ground_turret.cc
    5 
    6 
    72WorldEntities_SOURCES_ = \
    83                world_entities/npcs/npc_test1.cc \
Note: See TracChangeset for help on using the changeset viewer.