Changeset 3372

Timestamp:

02/06/10 14:07:02 (6 weeks ago)

Author:

trichards

Message:

Zen Server had some non-standard C++ usage. Fixed that, and added linking to Boost libraries.

Location:

Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base

Files:

• BaseClient/CMakeLists.template (modified) (1 diff)
• ZenServer/CMakeLists.template (modified) (3 diffs)
• ZenServer/ZenServer.cpp (modified) (3 diffs)

Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/BaseClient/CMakeLists.template

@@ -40 +40 @@
 add_dependencies( BaseClient ZenCore ZenEngine BaseCommon )
 
-target_link_libraries( BaseClient ZenCore ZenEngine BaseCommon ${SDL_LIBRARY} )
+target_link_libraries( BaseClient ZenCore ZenEngine BaseCommon ${SDL_LIBRARY} ${Boost_LIBRARIES} )
 
 set_target_properties ( BaseClient 

Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/ZenServer/CMakeLists.template

@@ -11 +11 @@
 
 Find_Package(IndieZen REQUIRED)
-Find_Package(Boost REQUIRED )
+Find_Package(Boost REQUIRED program_options filesystem)
 
 #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
@@ -24 +24 @@
 include_directories ( ${Boost_INCLUDE_DIR} ${INDIEZEN_PARENT} )
 
-link_directories ( ${DEV_LIB} )
+link_directories ( ${DEV_LIB} ${Boost_LIBRARY_DIRS} )
 
 add_executable( ZenServer ${ZenServer_SRC} )
@@ -30 +30 @@
 add_dependencies( ZenServer ZenCore ZenEnterprise )
 
-target_link_libraries( ZenServer ZenCore ZenEnterprise )
+target_link_libraries( ZenServer ZenCore ZenEnterprise ${Boost_LIBRARIES} )
 
 set_target_properties ( ZenServer 

Starter/branches/0185_GEN_PHYSICS_REFACTOR_2/Base/ZenServer/ZenServer.cpp

@@ -39 +39 @@
 
 #include <stddef.h>
-#include <conio.h>
 
 namespace po = boost::program_options;
@@ -103 +102 @@
     Zen::Plugins::I_PluginManager::app_ptr_type pApp = Zen::Plugins::I_PluginManager::getSingleton().installApplication(configPath);
 
-    Zen::Enterprise::AppServer::I_ApplicationServerManager& manager = 
+    Zen::Enterprise::AppServer::I_ApplicationServerManager& manager =
         Zen::Enterprise::AppServer::I_ApplicationServerManager::getSingleton();
 
@@ -151 +150 @@
     std::cout << "Running.... press a key to terminate." << std::endl;
 
-    getch();
-
     return 0;
 }