Updated to build static libraries.

Author: mhauskn

CMakeLists.txt

@@ -3,12 +3,14 @@ project(librcsc)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_definitions(-DHAVE_CONFIG_H -DUSE_VECTOR)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
 find_package(Boost REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(RCSC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rcsc)
@@ -39,14 +41,14 @@ foreach(src ${RCSC_GEOM_CPP})
 endforeach(src ${RCSC_GEOM_CPP})
 list(APPEND RCSC_GEOM_SOURCES ${RCSC_DIR}/geom/triangle/triangle.c)
 
-add_library(rcsc_ann SHARED ${RCSC_ANN_SOURCES})
-add_library(rcsc_geom SHARED ${RCSC_GEOM_SOURCES})
-add_library(rcsc_gz SHARED ${RCSC_GZ_SOURCES})
-add_library(rcsc_net SHARED ${RCSC_NET_SOURCES})
-add_library(rcsc_param SHARED ${RCSC_PARAM_SOURCES})
-add_library(rcsc_rcg SHARED ${RCSC_RCG_SOURCES})
-add_library(rcsc_time SHARED ${RCSC_TIME_SOURCES})
-add_library(rcsc_agent SHARED ${RCSC_ACTION_SOURCES}
+add_library(rcsc_ann STATIC ${RCSC_ANN_SOURCES})
+add_library(rcsc_geom STATIC ${RCSC_GEOM_SOURCES})
+add_library(rcsc_gz STATIC ${RCSC_GZ_SOURCES})
+add_library(rcsc_net STATIC ${RCSC_NET_SOURCES})
+add_library(rcsc_param STATIC ${RCSC_PARAM_SOURCES})
+add_library(rcsc_rcg STATIC ${RCSC_RCG_SOURCES})
+add_library(rcsc_time STATIC ${RCSC_TIME_SOURCES})
+add_library(rcsc_agent STATIC ${RCSC_ACTION_SOURCES}
   ${RCSC_COACH_SOURCES} ${RCSC_COMMON_SOURCES}
   ${RCSC_FORMATION_SOURCES} ${RCSC_MONITOR_SOURCES}
   ${RCSC_PLAYER_SOURCES} ${RCSC_TRAINER_SOURCES} ${RCSC_UTIL_SOURCES})
@@ -69,14 +71,12 @@ add_dependencies(rcgreverse rcsc_gz rcsc_rcg)
 add_dependencies(rcgverconv rcsc_gz rcsc_rcg)
 add_dependencies(rcgversion rcsc_gz)
 
-target_link_libraries(rcsc_gz z)
-target_link_libraries(rcg2txt rcsc_gz rcsc_rcg)
-target_link_libraries(rcgrenameteam rcsc_gz rcsc_rcg)
-target_link_libraries(rcgresultprinter rcsc_gz rcsc_rcg)
-target_link_libraries(rcgreverse rcsc_gz rcsc_rcg)
-target_link_libraries(rcgverconv rcsc_gz rcsc_rcg)
-target_link_libraries(rcgversion rcsc_gz)
-target_link_libraries(rcsc_agent rcsc_ann rcsc_geom rcsc_gz rcsc_net rcsc_param rcsc_rcg rcsc_time)
+target_link_libraries(rcg2txt rcsc_gz rcsc_rcg z)
+target_link_libraries(rcgrenameteam rcsc_gz rcsc_rcg z)
+target_link_libraries(rcgresultprinter rcsc_gz rcsc_rcg z)
+target_link_libraries(rcgreverse rcsc_gz rcsc_rcg z)
+target_link_libraries(rcgverconv rcsc_gz rcsc_rcg z)
+target_link_libraries(rcgversion rcsc_gz z)
 
 target_include_directories(rcsc_ann PUBLIC ${RCSC_DIR}/ann)
 target_include_directories(rcsc_geom PUBLIC ${RCSC_DIR}/geom ${RCSC_DIR}/geom/triangle)

rcsc/common/server_param.cpp

@@ -525,23 +525,23 @@ ServerParam::setDefaultParam()
 
     M_coach_send_vi_step = DEFAULT_COACH_SEND_VI_STEP;
 
-    M_replay_file = DEFAULT_REPLAY_FILE;
-    M_landmark_file = DEFAULT_LANDMARK_FILE;
+    M_replay_file = ""; //DEFAULT_REPLAY_FILE;
+    M_landmark_file = "~/.rcssserver-landmark.xml"; //DEFAULT_LANDMARK_FILE;
 
     M_send_comms = DEFAULT_SEND_COMMS;
 
     M_text_logging = DEFAULT_TEXT_LOGGING;
     M_game_logging = DEFAULT_GAME_LOGGING;
     M_game_log_version = DEFAULT_GAME_LOG_VERSION;
-    M_text_log_dir = DEFAULT_TEXT_LOG_DIR;
-    M_game_log_dir = DEFAULT_GAME_LOG_DIR;
-    M_text_log_fixed_name = DEFAULT_TEXT_LOG_FIXED_NAME;
-    M_game_log_fixed_name = DEFAULT_GAME_LOG_FIXED_NAME;
+    M_text_log_dir = "./"; //DEFAULT_TEXT_LOG_DIR;
+    M_game_log_dir = "./"; //DEFAULT_GAME_LOG_DIR;
+    M_text_log_fixed_name = "rcssserver"; //DEFAULT_TEXT_LOG_FIXED_NAME;
+    M_game_log_fixed_name = "rcssserver"; //DEFAULT_GAME_LOG_FIXED_NAME;
     M_use_text_log_fixed = DEFAULT_USE_TEXT_LOG_FIXED;
     M_use_game_log_fixed = DEFAULT_USE_GAME_LOG_FIXED;
     M_use_text_log_dated = DEFAULT_USE_TEXT_LOG_DATED;
     M_use_game_log_dated = DEFAULT_USE_GAME_LOG_DATED;
-    M_log_date_format = DEFAULT_LOG_DATE_FORMAT;
+    M_log_date_format = "%Y%m%d%H%M-"; //DEFAULT_LOG_DATE_FORMAT;
     M_log_times = DEFAULT_LOG_TIMES;
     M_record_message = DEFAULT_RECORD_MESSAGES;
     M_text_log_compression = DEFAULT_TEXT_LOG_COMPRESSION;
@@ -573,16 +573,16 @@ ServerParam::setDefaultParam()
     M_kick_off_wait = DEFAULT_KICK_OFF_WAIT;
     M_connect_wait = DEFAULT_CONNECT_WAIT;
     M_game_over_wait = DEFAULT_GAME_OVER_WAIT;
-    M_team_l_start = DEFAULT_TEAM_L_START;
-    M_team_r_start = DEFAULT_TEAM_R_START;
+    M_team_l_start = ""; //DEFAULT_TEAM_L_START;
+    M_team_r_start = ""; //DEFAULT_TEAM_R_START;
 
     M_keepaway_mode = DEFAULT_KEEPAWAY_MODE;
     M_keepaway_length = DEFAULT_KEEPAWAY_LENGTH;
     M_keepaway_width = DEFAULT_KEEPAWAY_WIDTH;
 
     M_keepaway_logging = DEFAULT_KEEPAWAY_LOGGING;
-    M_keepaway_log_dir = DEFAULT_KEEPAWAY_LOG_DIR;
-    M_keepaway_log_fixed_name = DEFAULT_KEEPAWAY_LOG_FIXED_NAME;
+    M_keepaway_log_dir = "./"; //DEFAULT_KEEPAWAY_LOG_DIR;
+    M_keepaway_log_fixed_name = "rcssserver"; //DEFAULT_KEEPAWAY_LOG_FIXED_NAME;
     M_keepaway_log_fixed = DEFAULT_KEEPAWAY_LOG_FIXED;
     M_keepaway_log_dated = DEFAULT_KEEPAWAY_LOG_DATED;
 
@@ -604,7 +604,7 @@ ServerParam::setDefaultParam()
     M_pen_max_goalie_dist_x = DEFAULT_PEN_MAX_GOALIE_DIST_X;
     M_pen_coach_moves_players = DEFAULT_PEN_COACH_MOVES_PLAYERS;
 
-    M_module_dir = DEFAULT_MODULE_DIR;
+    M_module_dir = ""; //DEFAULT_MODULE_DIR;
 
     // 11.0.0
     M_ball_stuck_area = DEFAULT_BALL_STUCK_AREA;