diff --git a/src/tools/Extractor_projects/Movemap-Generator/CMakeLists.txt b/src/tools/Extractor_projects/Movemap-Generator/CMakeLists.txt
index 50ab3573a..82ac3a18c 100644
--- a/src/tools/Extractor_projects/Movemap-Generator/CMakeLists.txt
+++ b/src/tools/Extractor_projects/Movemap-Generator/CMakeLists.txt
@@ -67,11 +67,23 @@ else()
     target_link_libraries(${EXECUTABLE_NAME} ACE)
 endif()
 
+target_link_libraries(${EXECUTABLE_NAME} g3dlite vmap detour recast zlib shared)
+
+set(EXECUTABLE_LINK_FLAGS "")
+
 if(UNIX)
-    target_link_libraries(${EXECUTABLE_NAME} rt)
+    if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -lrt -pthread ${EXECUTABLE_LINK_FLAGS}")
+    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
+    endif()
 endif()
 
-target_link_libraries(${EXECUTABLE_NAME} g3dlite vmap detour recast zlib shared)
+if(APPLE)
+    set(EXECUTABLE_LINK_FLAGS "-framework CoreServices ${EXECUTABLE_LINK_FLAGS}")
+endif()
+
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
 
 #Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
 if(WIN32)
@@ -92,3 +104,5 @@ install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
 if(WIN32 AND MSVC)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
 endif()
+Contact GitHub API Training Shop Blog About
+© 2016 GitHub, Inc. Terms Privacy Security Status Help
\ No newline at end of file
diff --git a/src/tools/Extractor_projects/vmap-assembler/CMakeLists.txt b/src/tools/Extractor_projects/vmap-assembler/CMakeLists.txt
index 96e65f549..7bde6c4c6 100644
--- a/src/tools/Extractor_projects/vmap-assembler/CMakeLists.txt
+++ b/src/tools/Extractor_projects/vmap-assembler/CMakeLists.txt
@@ -47,20 +47,22 @@ else()
     target_link_libraries(${EXECUTABLE_NAME} ACE)
 endif()
 
-if(UNIX)
-    target_link_libraries(${EXECUTABLE_NAME} rt dl)
-endif()
-
 target_link_libraries(${EXECUTABLE_NAME} vmap g3dlite zlib)
 
 set(EXECUTABLE_LINK_FLAGS "")
 
 if(UNIX)
-    if(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
-        set(EXECUTABLE_LINK_FLAGS "-pthread${EXECUTABLE_LINK_FLAGS}")
+    if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -lrt -pthread ${EXECUTABLE_LINK_FLAGS}")
+    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(EXECUTABLE_LINK_FLAGS "-Wl,--no-as-needed -ldl -pthread -lrt ${EXECUTABLE_LINK_FLAGS}")
     endif()
 endif()
 
+if(APPLE)
+    set(EXECUTABLE_LINK_FLAGS "-framework CoreServices ${EXECUTABLE_LINK_FLAGS}")
+endif()
+
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${EXECUTABLE_LINK_FLAGS}")
 
 #Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default
@@ -81,4 +83,4 @@ endif()
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}/${TOOLS_DIR}")
 if(WIN32 AND MSVC)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}/${TOOLS_DIR}" CONFIGURATIONS Debug)
-endif()
+endif()
\ No newline at end of file