Changeset 7264 in orxonox.OLD for branches/shared_lib/src/orxonox.cc

Timestamp:

Apr 2, 2006, 4:51:19 PM (18 years ago)

Author:

bensch

Message:

shared_lib: compile again

File:

• branches/shared_lib/src/orxonox.cc (modified) (10 diffs)

branches/shared_lib/src/orxonox.cc

@@ -54 +54 @@
 
 #include "util/loading/load_param_description.h"
+#include "util/loading/dynamic_loader.h"
 
 #include "network_manager.h"
@@ -292 +293 @@
     NetworkManager::getInstance()->establishConnection(this->serverName, port);
   }
-  else if( this->port > 0) {    // we are a server
+  else if( this->port > 0)
+  {    // we are a server
     State::setOnline(true);
     NetworkManager::getInstance()->createServer(port);
@@ -300 +302 @@
 
 #include "util/loading/dynamic_loader.h"
-
 /**
  * initializes and loads resource files
@@ -340 +341 @@
   ResourceManager::getInstance()->addImageDir(imageDir);
 
-  DynamicLoader::loadDyLib("libtest.so");
+  if (!DynamicLoader::addSearchDirRelative("./world_entities"))
+    if (!DynamicLoader::addSearchDirRelative("./src/world_entities"))
+      DynamicLoader::addSearchDir(PKG_LIBDIR);
+
+  /// FIXME make this more modular (search for himself for all the libraries
+  printf("%s\n", DynamicLoader::getSearchDir());
+  DynamicLoader::loadDyLib("libORXplayables.la");
+  DynamicLoader::loadDyLib("libORXweapons.la");
+  DynamicLoader::loadDyLib("libORXprojectiles.la");
+  DynamicLoader::loadDyLib("libORXpower_ups.la");
+
+  DynamicLoader::loadDyLib("libORXenvironmentals.la");
+
+  DynamicLoader::loadDyLib("libORXnpcs");
+
+  DynamicLoader::loadDyLib("libORXmisc_entities");
+  printf("%s\n", DynamicLoader::getSearchDir());
 
   // start the collision detection engine
@@ -417 +434 @@
 {
   CmdLinePrefsReader prefs;
-  
+
   IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
-  
+
   prefs.parse(argc, argv);
-  
+
   if ( Preferences::getInstance()->getString("misc", "showLicenseAndExit", "") == "1" )
   {
@@ -427 +444 @@
     return 0;
   }
-  
+
   if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
     showGui = true;
@@ -433 +450 @@
            Preferences::getInstance()->getString( "game", "gameType", "" ) == "multiplayer_client" )
     return startNetworkOrxonox(argc, argv);
-  
+
   return startOrxonox(argc, argv, "", -1);
   return 0;
@@ -449 +466 @@
 
   std::string gameType = Preferences::getInstance()->getString( "game", "gameType", "" );
-  
+
   if ( gameType == "multiplayer_client" )
   {
     int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
     std::string host = Preferences::getInstance()->getString( "game", "host", "" );
-    
+
     if ( host == "" )
     {
@@ -460 +477 @@
       return 1;
     }
-    
+
     printf("Starting Orxonox as client: connecting to %s, on port %i\n", host.c_str(), port);
-    
+
     startOrxonox(argc, argv, host.c_str(), port);
   }
@@ -468 +485 @@
   {
     int port = Preferences::getInstance()->getInt( "game", "port", DEFAULT_ORXONOX_PORT );
-    
+
     printf("Starting Orxonox as server: listening on port %i\n", port);
-    
+
     startOrxonox(argc, argv, "", port);
   }