Merge remote-tracking branch 'ace/win_fix'

CMakeLists.txt

@@ -630,6 +630,7 @@ if (APPLE)
         include(CPack)
 endif (APPLE)
 
+if (NOT WIN32)
     ## Linux building
     # paths
     set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries")
@@ -660,3 +661,4 @@ INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.cfg" DESTINATION "${SYSCONFDIR}" )
     # Install resources
     INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${DATADIR}" )
     INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${DATADIR}/resources" )
+endif(NOT WIN32)

components/files/fixedpath.hpp

@@ -69,7 +69,7 @@ struct FixedPath
      * \param [in] application_name - Name of the application
      */
     FixedPath(const std::string& application_name)
-        : mPath(application_name)
+        : mPath(application_name + "/")
         , mUserPath(mPath.getUserPath())
         , mGlobalPath(mPath.getGlobalPath())
         , mLocalPath(mPath.getLocalPath())