Split controller into planning

CMakeLists.txt

@@ -12,21 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 cmake_minimum_required (VERSION 2.8.0)
-project(mujincontrollerclient)
+project(mujinplanningclient)
 set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 
 # Define here the needed parameters
 # make sure to change the version in docs/Makefile
-set (MUJINCLIENT_VERSION_MAJOR 0)
-set (MUJINCLIENT_VERSION_MINOR 65)
-set (MUJINCLIENT_VERSION_PATCH 1)
-set (MUJINCLIENT_VERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR}.${MUJINCLIENT_VERSION_PATCH})
-set (MUJINCLIENT_SOVERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR})
-set (CLIENT_SOVERSION ${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR})
-message(STATUS "Compiling MUJIN Controller Client C++ Version ${MUJINCLIENT_VERSION}, soversion=${CLIENT_SOVERSION}")
+set (MUJINPLANNINGCLIENT_VERSION_MAJOR 0)
+set (MUJINPLANNINGCLIENT_VERSION_MINOR 65)
+set (MUJINPLANNINGCLIENT_VERSION_PATCH 0)
+set (MUJINPLANNINGCLIENT_VERSION ${MUJINPLANNINGCLIENT_VERSION_MAJOR}.${MUJINPLANNINGCLIENT_VERSION_MINOR}.${MUJINPLANNINGCLIENT_VERSION_PATCH})
+set (MUJINPLANNINGCLIENT_SOVERSION ${MUJINPLANNINGCLIENT_VERSION_MAJOR}.${MUJINPLANNINGCLIENT_VERSION_MINOR})
+set (CLIENT_SOVERSION ${MUJINPLANNINGCLIENT_VERSION_MAJOR}.${MUJINPLANNINGCLIENT_VERSION_MINOR})
+message(STATUS "Compiling MUJIN Planning Client C++ Version ${MUJINPLANNINGCLIENT_VERSION}, soversion=${CLIENT_SOVERSION}")
 
-set(MUJINCLIENT_CMAKE_INSTALL_DIR "mujincontrollerclient-${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR}" CACHE STRING "Directory to install the cmake config files.")
-set(MUJINCLIENT_TARGET_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE STRING "The target processor architecture to build for, this is combined with the generator toolchain")
+set(MUJINPLANNINGCLIENT_CMAKE_INSTALL_DIR "mujinplanningclient-${MUJINPLANNINGCLIENT_VERSION_MAJOR}.${MUJINPLANNINGCLIENT_VERSION_MINOR}" CACHE STRING "Directory to install the cmake config files.")
+set(MUJINPLANNINGCLIENT_TARGET_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE STRING "The target processor architecture to build for, this is combined with the generator toolchain")
 
 message(STATUS "Using cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" )
 # http://www.cmake.org/cmake/help/cmake-2.6.html#policy:CMP0002
@@ -63,12 +63,18 @@ include(CheckCXXSourceCompiles)
 include(CheckCXXSourceRuns)
 include(CheckCXXCompilerFlag)
 
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/include
+  ${CMAKE_CURRENT_BINARY_DIR}/include
+) # have to do this before every other include!
+
+
 add_definitions("-DBOOST_SPIRIT_THREADSAFE") # for json parsing
 
 # have to include before boost since the boost headers can be located in a previous installed version of this library
-set(MUJINCLIENT_INCLUDE_LOCAL_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-include_directories(${MUJINCLIENT_INCLUDE_LOCAL_DIRS})
+set(MUJINPLANNINGCLIENT_INCLUDE_LOCAL_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/include)
+include_directories(${MUJINPLANNINGCLIENT_INCLUDE_LOCAL_DIRS})
 
 if( MSVC )
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
@@ -102,7 +108,7 @@ if( MSVC )
 
   check_include_file(stdint.h HAVE_STDINT_H)
   if( NOT HAVE_STDINT_H )
-    #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/msvc_include/stdint.h DESTINATION include/mujinclient-${MUJINCLIENT_VERSION_MAJOR}.${MUJINCLIENT_VERSION_MINOR} COMPONENT ${COMPONENT_PREFIX}dev)
+    #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/msvc_include/stdint.h DESTINATION include/mujinplanningclient-${MUJINPLANNINGCLIENT_VERSION_MAJOR}.${MUJINPLANNINGCLIENT_VERSION_MINOR} COMPONENT ${COMPONENT_PREFIX}dev)
     #include_directories(${CMAKE_CURRENT_SOURCE_DIR}/msvc_include)
   endif()
 
@@ -120,38 +126,38 @@ if( MSVC )
     set(MSVC_PREFIX "vc100")
     set(MSVC_PREFIX2 "v100")
   endif()
-  set(MUJINCLIENT_LIBRARY_SUFFIX "${MUJINCLIENT_SOVERSION}-${MSVC_PREFIX}-mt" CACHE STRING "Suffix to append to library names")
+  set(MUJINPLANNINGCLIENT_LIBRARY_SUFFIX "${MUJINPLANNINGCLIENT_SOVERSION}-${MSVC_PREFIX}-mt" CACHE STRING "Suffix to append to library names")
 
   # install all DLLs
-  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/bin/" DESTINATION bin FILES_MATCHING PATTERN "*.dll")
+  install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/bin/" DESTINATION bin FILES_MATCHING PATTERN "*.dll")
 
   # force multi-threaded DLL boost
   set(Boost_USE_MULTITHREAD ON)
   set(Boost_USE_STATIC_LIBS OFF)
   set(Boost_USE_STATIC_RUNTIME OFF)
   set(Boost_CFLAGS "-DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB")
 else()
-  set(MUJINCLIENT_LIBRARY_SUFFIX "${MUJINCLIENT_SOVERSION}" CACHE STRING "Suffix to append to library names")
+  set(MUJINPLANNINGCLIENT_LIBRARY_SUFFIX "${MUJINPLANNINGCLIENT_SOVERSION}" CACHE STRING "Suffix to append to library names")
 endif()
 
-set(MUJINCLIENT_LINK_DIRS)
+set(MUJINPLANNINGCLIENT_LINK_DIRS)
 
 find_package(PkgConfig)
-set(MUJINCLIENT_LOG4CXX 0)
+set(MUJINPLANNINGCLIENT_LOG4CXX 0)
 if (OPT_LOG4CXX)
   pkg_check_modules(LOG4CXX liblog4cxx)
   if (LOG4CXX_FOUND)
     if( MSVC )
-      set(MUJINCLIENT_LOG4CXX_INCLUDE_DIRS "/I\"${LOG4CXX_INCLUDEDIR}\"")
-      set(MUJINCLIENT_LOG4CXX_LIB_DIRS "/LIBPATH:\"${LOG4CXX_LIBDIR}\"")
+      set(MUJINPLANNINGCLIENT_LOG4CXX_INCLUDE_DIRS "/I\"${LOG4CXX_INCLUDEDIR}\"")
+      set(MUJINPLANNINGCLIENT_LOG4CXX_LIB_DIRS "/LIBPATH:\"${LOG4CXX_LIBDIR}\"")
     else()
-      set(MUJINCLIENT_LOG4CXX_INCLUDE_DIRS "-I${LOG4CXX_INCLUDEDIR}")
-      set(MUJINCLIENT_LOG4CXX_LIB_DIRS "-L${LOG4CXX_LIBDIR}")
+      set(MUJINPLANNINGCLIENT_LOG4CXX_INCLUDE_DIRS "-I${LOG4CXX_INCLUDEDIR}")
+      set(MUJINPLANNINGCLIENT_LOG4CXX_LIB_DIRS "-L${LOG4CXX_LIBDIR}")
     endif()
-    set(MUJINCLIENT_LOG4CXX_LIBRARY "-l${LOG4CXX_LIBRARIES}")
+    set(MUJINPLANNINGCLIENT_LOG4CXX_LIBRARY "-l${LOG4CXX_LIBRARIES}")
 
-    set(MUJINCLIENT_LINK_DIRS ${MUJINCLIENT_LINK_DIRS} ${LOG4CXX_LIBDIR})
-    set(MUJINCLIENT_LOG4CXX 1)
+    set(MUJINPLANNINGCLIENT_LINK_DIRS ${MUJINPLANNINGCLIENT_LINK_DIRS} ${LOG4CXX_LIBDIR})
+    set(MUJINPLANNINGCLIENT_LOG4CXX 1)
   endif()
 endif()
 
@@ -182,11 +188,11 @@ endif()
 
 if( Boost_FOUND )
   include_directories(${Boost_INCLUDE_DIRS})
-  set(MUJINCLIENT_LINK_DIRS ${MUJINCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
+  set(MUJINPLANNINGCLIENT_LINK_DIRS ${MUJINPLANNINGCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
   set(EXTRA_MSVC_DEPEND) # reset extra depend
 elseif(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
   include_directories(${Boost_INCLUDE_DIRS})
-  set(MUJINCLIENT_LINK_DIRS ${MUJINCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
+  set(MUJINPLANNINGCLIENT_LINK_DIRS ${MUJINPLANNINGCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
   set(EXTRA_MSVC_DEPEND msvc_boost) # reset extra depend
 elseif( MSVC )
   # to facilitate compilation, visual studio libraries are included locally
@@ -195,7 +201,7 @@ elseif( MSVC )
   set(Boost_FOUND 1)
   set(Boost_INCLUDE_DIRS "${BOOST_ROOT}")
   set(Boost_INCLUDE_DIR "${BOOST_ROOT}")
-  set(Boost_LIBRARY_DIRS "${BOOST_ROOT}/${MUJINCLIENT_TARGET_PROCESSOR}/lib")
+  set(Boost_LIBRARY_DIRS "${BOOST_ROOT}/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/lib")
   set(Boost_REGEX_FOUND 0)
   set(Boost_FILESYSTEM_FOUND 1)
   set(Boost_IOSTREAMS_FOUND 1)
@@ -227,7 +233,7 @@ elseif( MSVC )
   install(FILES ${Boost_DATE_TIME_LIBRARY_DLL} ${Boost_THREAD_LIBRARY_DLL} ${Boost_SYSTEM_LIBRARY_DLL} ${Boost_FILESYSTEM_LIBRARY_DLL} ${Boost_PROGRAM_OPTIONS_LIBRARY_DLL} DESTINATION bin COMPONENT ${COMPONENT_PREFIX}dev)
   install(DIRECTORY "${Boost_INCLUDE_DIR}/boost" DESTINATION include COMPONENT ${COMPONENT_PREFIX}dev)
   include_directories(${Boost_INCLUDE_DIRS})
-  set(MUJINCLIENT_LINK_DIRS ${MUJINCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
+  set(MUJINPLANNINGCLIENT_LINK_DIRS ${MUJINPLANNINGCLIENT_LINK_DIRS} ${Boost_LIBRARY_DIRS})
 else()
   message(FATAL_ERROR "Could not find boost libraries!")
 endif()
@@ -256,14 +262,14 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
   add_definitions("-fno-strict-aliasing -Wall -Werror=shadow")
 endif( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/mujincontrollerclient/config.h IMMEDIATE @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/mujinplanningclient/config.h IMMEDIATE @ONLY)
 
 find_package(CURL)
 if( NOT CURL_FOUND )
   if( MSVC )
-    message(STATUS "setting local curl library from msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}")
-    set(CURL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/include")
-    set(CURL_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/lib/libcurl-${MSVC_PREFIX}-mt_imp.lib")
+    message(STATUS "setting local curl library from msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}")
+    set(CURL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/include")
+    set(CURL_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/lib/libcurl-${MSVC_PREFIX}-mt_imp.lib")
   else()
     message(FATAL_ERROR "could not find CURL library")
   endif()
@@ -297,10 +303,10 @@ else()
   endif()
   if (NOT libzmq_FOUND)
     if( MSVC )
-      set(libzmq_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/include")
-      set(libzmq_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/lib/libzmq-${MSVC_PREFIX2}-mt-4_0_4.lib")
+      set(libzmq_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/include")
+      set(libzmq_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}/lib/libzmq-${MSVC_PREFIX2}-mt-4_0_4.lib")
       if(EXISTS ${libzmq_LIBRARIES} )
-        message(STATUS "setting local zmq library from msvc_binaries/${MUJINCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}")
+        message(STATUS "setting local zmq library from msvc_binaries/${MUJINPLANNINGCLIENT_TARGET_PROCESSOR}/${MSVC_PREFIX}")
         set(libzmq_FOUND 1)
       else()
         message(STATUS "could not find msvc zmq library ${libzmq_LIBRARIES}")
@@ -311,21 +317,22 @@ endif()
 
 if (libzmq_FOUND)
   include_directories(${libzmq_INCLUDE_DIRS})
-  set(MUJINCLIENT_LINK_DIRS ${MUJINCLIENT_LINK_DIRS} ${libzmq_LIBRARY_DIRS})
+  set(MUJINPLANNINGCLIENT_LINK_DIRS ${MUJINPLANNINGCLIENT_LINK_DIRS} ${libzmq_LIBRARY_DIRS})
 else()
   message(WARNING "compiling without libzmq library")
 endif()
 
-file(GLOB mujin_header_files ${CMAKE_CURRENT_SOURCE_DIR}/include/mujincontrollerclient/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mujincontrollerclient/*.hpp)
-install(FILES ${mujin_header_files} ${CMAKE_CURRENT_BINARY_DIR}/include/mujincontrollerclient/config.h DESTINATION include/mujincontrollerclient)
+file(GLOB mujin_header_files ${CMAKE_CURRENT_SOURCE_DIR}/src/include/mujinplanningclient/*.h ${CMAKE_CURRENT_SOURCE_DIR}/src/include/mujinplanningclient/*.hpp)
+install(FILES ${mujin_header_files} DESTINATION include/mujinplanningclient)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/mujinplanningclient/config.h DESTINATION include/mujinplanningclient)
 
 macro(build_sample name)
   include_directories(${LOG4CXX_INCLUDEDIR} ${libzmq_INCLUDE_DIRS})
   link_directories(${LOG4CXX_LIBDIR})
   add_executable(${name} ${name}.cpp)
   set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${Boost_CFLAGS}" LINK_FLAGS "")
-  add_dependencies(${name} libmujincontrollerclient)
-  target_link_libraries (${name} libmujincontrollerclient ${Boost_THREAD_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${EXTRA_LIBRARIES} ${LOG4CXX_LIBRARIES})
+  add_dependencies(${name} libmujinplanningclient)
+  target_link_libraries (${name} libmujinplanningclient ${Boost_THREAD_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${EXTRA_LIBRARIES} ${LOG4CXX_LIBRARIES})
   install(TARGETS ${name} DESTINATION bin)
 endmacro(build_sample)
 
@@ -337,15 +344,15 @@ if( OPT_BUILD_TESTS )
   add_subdirectory(test)
 endif()
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share/mujincontrollerclient DESTINATION share)
+#install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share/mujinplanningclient DESTINATION share)
 
 # add make uninstall capability
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
-set(MujinControllerClient_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mujincontrollerclient-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mujincontrollerclient-config.cmake" IMMEDIATE @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mujincontrollerclient-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mujincontrollerclient-config-version.cmake" IMMEDIATE @ONLY)
+set(MujinPlanningClient_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mujinplanningclient-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mujinplanningclient-config.cmake" IMMEDIATE @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mujinplanningclient-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mujinplanningclient-config-version.cmake" IMMEDIATE @ONLY)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mujincontrollerclient-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mujincontrollerclient-config-version.cmake" DESTINATION "lib${LIB_SUFFIX}/cmake/${MUJINCLIENT_CMAKE_INSTALL_DIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mujinplanningclient-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mujinplanningclient-config-version.cmake" DESTINATION "lib${LIB_SUFFIX}/cmake/${MUJINPLANNINGCLIENT_CMAKE_INSTALL_DIR}")
 

README.rst

@@ -43,7 +43,7 @@ There are two ways ot link with the libraries:
 Building on Windows
 -------------------
 
-In the following documentation %MUJINCLIENTGIT% means the root directory where the sources are checked out.
+In the following documentation %MUJINPLANNINGCLIENTGIT% means the root directory where the sources are checked out.
 
 1. Checkout the source code and install
 
@@ -53,7 +53,7 @@ In the following documentation %MUJINCLIENTGIT% means the root directory where t
 
 2. Download and install `CMake <http://www.cmake.org/cmake/resources/software.html>`_ (>= v2.8.10)
 
-3. Run CMake on ``%MUJINCLIENTGIT%``, choose the correct Visual Studio version for the Generator.
+3. Run CMake on ``%MUJINPLANNINGCLIENTGIT%``, choose the correct Visual Studio version for the Generator.
 
   The most important CMake options are:
 
@@ -72,7 +72,7 @@ In the following documentation %MUJINCLIENTGIT% means the root directory where t
 5. To build the project using the Visual Studio Command Prompt
   ::
 
-     cd %MUJINCLIENTGIT%\build
+     cd %MUJINPLANNINGCLIENTGIT%\build
      msbuild mujincontrollerclient.sln /p:Configuration=Release
 
 6. In order to Install into ``c:\Program Files``, compile the **INSTALL** project. For Visual Studio 9 2008 and above use
@@ -92,7 +92,7 @@ Make sure to use the Visual Studio Generators that ends with Win64. For example
 Building x86 architecture on x64 Windows
 ========================================
 
-It is possible to force the architecture that Windows builds on by setting the **MUJINCLIENT_TARGET_PROCESSOR**
+It is possible to force the architecture that Windows builds on by setting the **MUJINPLANNINGCLIENT_TARGET_PROCESSOR**
 
   .. image:: https://raw.github.com/mujin/controllerclientcpp/master/docs/crosscompile_forcex86.png
 
@@ -118,12 +118,12 @@ If OpenSSL libraries do not exist for the specific Visual Studio version
 
   For win32 (x86) run::
 
-    perl Configure VC-WIN32 --prefix=%MUJINCLIENTGIT%\msvc_binaries\x86\vcXX
+    perl Configure VC-WIN32 --prefix=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\x86\vcXX
     ms\do_nasm
 
   For win64 (amd64) run::
 
-    perl Configure VC-WIN64A --prefix=%MUJINCLIENTGIT%\msvc_binaries\amd64\vcXX
+    perl Configure VC-WIN64A --prefix=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\amd64\vcXX
     ms\do_win64a
 
   For all builds, run::
@@ -140,19 +140,19 @@ If libcurl libraries do not exist for the specific Visual Studio version
 
 1. Uncompress ``curl-7.32.0-patched.tar.gz``
 
-2. In the Visual Studio Command Prompt and cd into ``%MUJINCLIENTGIT%/curl-7.32.0`` and double check the lib/CMakeLists.txt. Create and compile the project with the following command::
+2. In the Visual Studio Command Prompt and cd into ``%MUJINPLANNINGCLIENTGIT%/curl-7.32.0`` and double check the lib/CMakeLists.txt. Create and compile the project with the following command::
 
     mkdir buildvcXX
     cd buildvcXX
 
   For x86::
 
-    cmake -DOPENSSL_ROOT_DIR=%MUJINCLIENTGIT%\msvc_binaries\x86\vcXX -DCMAKE_REQUIRED_INCLUDES=%MUJINCLIENTGIT%\msvc_binaries\x86\vcXX\include -DBUILD_CURL_TESTS=OFF -DCURL_USE_ARES=OFF -DCURL_STATICLIB=OFF -DCMAKE_INSTALL_PREFIX=%MUJINCLIENTGIT%\msvc_binaries\x86\vcXX -G "Visual Studio XX" ..
+    cmake -DOPENSSL_ROOT_DIR=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\x86\vcXX -DCMAKE_REQUIRED_INCLUDES=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\x86\vcXX\include -DBUILD_CURL_TESTS=OFF -DCURL_USE_ARES=OFF -DCURL_STATICLIB=OFF -DCMAKE_INSTALL_PREFIX=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\x86\vcXX -G "Visual Studio XX" ..
 	msbuild CURL.sln /p:Configuration=Release
 
   For amd64::
 
-    cmake -DOPENSSL_ROOT_DIR=%MUJINCLIENTGIT%\msvc_binaries\amd64\vcXX -DCMAKE_REQUIRED_INCLUDES=%MUJINCLIENTGIT%\msvc_binaries\amd64\vcXX\include -DBUILD_CURL_TESTS=OFF -DCURL_USE_ARES=OFF -DCURL_STATICLIB=OFF -DCMAKE_INSTALL_PREFIX=%MUJINCLIENTGIT%\msvc_binaries\amd64\vcXX -G "Visual Studio XX Win64" ..
+    cmake -DOPENSSL_ROOT_DIR=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\amd64\vcXX -DCMAKE_REQUIRED_INCLUDES=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\amd64\vcXX\include -DBUILD_CURL_TESTS=OFF -DCURL_USE_ARES=OFF -DCURL_STATICLIB=OFF -DCMAKE_INSTALL_PREFIX=%MUJINPLANNINGCLIENTGIT%\msvc_binaries\amd64\vcXX -G "Visual Studio XX Win64" ..
     msbuild CURL.sln /p:Configuration=Release
 
 3. To install, for Visual Studio 10 2010 and above use