Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7269 in orxonox.OLD


Ignore:
Timestamp:
Apr 2, 2006, 7:11:39 PM (18 years ago)
Author:
bensch
Message:

creating and linking ltdl… hmm.. lets see if this works

Location:
branches/shared_lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/shared_lib/Makefile.am

    r7264 r7269  
    22
    33SUBDIRS = \
    4         src
     4        src \
     5        libltdl
    56
    67EXTRA_DIST = CODING-STANDARDS \

  • branches/shared_lib/autogen.sh

    r7264 r7269  
    4040#echo "Running gettextize, please ignore non-fatal messages...."
    4141#$SETUP_GETTEXT
    42 #echo "Running libtoolize, please ignore non-fatal messages...."
    43 #echo n | libtoolize --copy --force || exit;
     42echo "Running libtoolize, please ignore non-fatal messages...."
     43echo n | libtoolize --ltdl --copy --force || exit;
    4444
    4545# Add other directories to this list if people continue to experience

  • branches/shared_lib/configure.ac

    r7264 r7269  
    4545#########################
    4646AC_PROG_CXX
     47
     48AC_LIBLTDL_CONVENIENCE
    4749AC_LIBTOOL_DLOPEN
    4850AC_PROG_LIBTOOL
    4951AC_HEADER_STDC
     52AC_CONFIG_SUBDIRS(libltdl)
    5053
    5154## THIS IS OUR DEFAULT-DATA-DIRECTORY
    … …  
    5861#----------------#
    5962DATA_DIR=$datadir
    60 echo \$\{prefix\}
    6163if test $DATA_DIR = \$\{prefix\}/share ; then
    6264        echo "not given"
    … …  
    294296    MSBITFIELDS="-mms-bitfields"
    295297    MWINDOWS="-mwindows"
    296 
    297298#--------#
    298299# MIN-GW #
    … …  
    497498## CHECKING FOR HEADERS AND LIBS ##
    498499###################################
     500
    499501
    500502AX_CHECK_REQUIRED_HEADER_LIB([ltdl.h], [ltdl], [main],,, [http://www.gnu.org/software/libtool])
    … …  
    650652                 src/lib/parser/ini_parser/Makefile
    651653                 src/lib/parser/cmdline_parser/Makefile
    652                 src/lib/parser/preferences/Makefile
     654                src/lib/parser/preferences/Makefile
    653655                 src/util/Makefile
    654656                 src/world_entities/Makefile
    … …  
    660662                 src/subprojects/network/Makefile
    661663                 ])
    662 
    663664AC_OUTPUT

  • branches/shared_lib/src/Makefile.am

    r7267 r7269  
    2323                world_entities/libORXwe.a \
    2424                util/libORXutils.a \
     25                $(LIBLTDL) \
    2526                $(libORXlibs_a_LIBRARIES_) \
    2627                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

  • branches/shared_lib/src/orxonox.cc

    r7268 r7269  
    349349  /// FIXME make this more modular (search for himself for all the libraries
    350350  PRINTF(0)("We are searching for plugins in %s\n", DynamicLoader::getSearchDir());
    351   DynamicLoader::loadDyLib("libORXplayables.la");
    352351  DynamicLoader::loadDyLib("libORXweapons.la");
    353352  DynamicLoader::loadDyLib("libORXprojectiles.la");
    … …  
    357356
    358357  DynamicLoader::loadDyLib("libORXmisc_entities.la");
     358
     359  DynamicLoader::loadDyLib("libORXplayables.la");
    359360  DynamicLoader::loadDyLib("libORXnpcs.la");
    360361  printf("%s\n", DynamicLoader::getSearchDir());

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

    r7268 r7269  
    4141#               npcs/npc.cc
    4242
    43 LDFLAGS = --export-dynamic -module
     43AM_LDFLAGS = --export-dynamic -module
    4444
    4545pkglib_LTLIBRARIES = \
Note: See TracChangeset for help on using the changeset viewer.