Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit fe22bc62 authored by VAN TOLL Wouter's avatar VAN TOLL Wouter
Browse files

Renamed all occurrences of OCSR to UMANS.

parent b6acc81d
......@@ -32,7 +32,7 @@
extern "C"
{
/// <summary>A struct that describes the status of a single agent in the simulation.
/// This struct is used for communication between the OCSR library and external applications.</summary>
/// This struct is used for communication between the UMANS library and external applications.</summary>
struct AgentData
{
/// The unique ID of the agent.
......@@ -106,7 +106,7 @@ extern "C"
/// i.e. if the simulation has not been initialized (correctly) yet, or if the agent with the given ID does not exist.</returns>
API_FUNCTION bool SetAgentGoal(int id, float x, float y);
/// <summary>Cleans up some objects related to the simulation. Call this method just before you finish using the OCSR library.</summary>
/// <summary>Cleans up some objects related to the simulation. Call this method just before you finish using the UMANS library.</summary>
/// <returns>true if the operation was successful; false otherwise, i.e. if the simulation has not been initialized (correctly) yet.</returns>
API_FUNCTION bool CleanUp();
}
\ No newline at end of file
......@@ -38,20 +38,20 @@ file( GLOB_RECURSE 3rd_party 3rd-party/tinyxml/* 3rd-party/nanoflann/*)
# === Use multithreading?
option(OCSR_USE_MULTITHREADING "Allow the program to use multiple parallel threads" ON)
if (OCSR_USE_MULTITHREADING)
option(UMANS_USE_MULTITHREADING "Allow the program to use multiple parallel threads" ON)
if (UMANS_USE_MULTITHREADING)
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /openmp")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
endif (MSVC)
endif(OCSR_USE_MULTITHREADING)
endif ()
endif (UMANS_USE_MULTITHREADING)
# === Linux compatibility compiler option
if (NOT MSVC)
add_definitions(-fPIC)
endif() #
endif()
# === Engine project: a static library that performs the simulation
......@@ -60,17 +60,17 @@ add_library(Engine STATIC ${source_files} ${3rd_party})
# === Console application
if (WIN32)
add_executable(OCSR_ConsoleApplication_Windows main.cpp)
target_link_libraries(OCSR_ConsoleApplication_Windows Engine)
add_executable(UMANS_ConsoleApplication_Windows main.cpp)
target_link_libraries(UMANS_ConsoleApplication_Windows Engine)
else()
add_executable(OCSR_ConsoleApplication_Linux main.cpp)
target_link_libraries(OCSR_ConsoleApplication_Linux Engine)
add_executable(UMANS_ConsoleApplication_Linux main.cpp)
target_link_libraries(UMANS_ConsoleApplication_Linux Engine)
endif()
# === Dynamic library (e.g. a DLL on Windows) to include into other programs
add_library(OCSR_Library SHARED "APIFunctions.h" "APIFunctions.cpp")
target_link_libraries(OCSR_Library Engine)
add_library(UMANS_Library SHARED "APIFunctions.h" "APIFunctions.cpp")
target_link_libraries(UMANS_Library Engine)
# === Clean up the project's directory structure
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment