Merge pull request #5686 from Web-eWorks/windows-install-dirs

Fix installed directory structure on Windows

CMakeLists.txt

@@ -11,7 +11,6 @@ if(POLICY CMP0072)
  cmake_policy(SET CMP0072 NEW)
 endif()
 
-include(GNUInstallDirs)
 include(cmake/InstallPioneer.cmake)
 
 if (MINGW)
@@ -453,7 +452,7 @@ if(APPIMAGE_BUILD)
  set(PIONEER_SH_FILE ${CMAKE_BINARY_DIR}/init_pioneer.sh)
  configure_file(init_pioneer.sh.cmakein ${PIONEER_SH_FILE} @ONLY)
  install(FILES ${PIONEER_SH_FILE}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
+ DESTINATION ${PIONEER_INSTALL_BINDIR}
  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
  )
 else(APPIMAGE_BUILD)

cmake/InstallPioneer.cmake

@@ -1,5 +1,21 @@
 # Setup script for Pioneer installation paths
 
+if (WIN32)
+ # We don't want a 'bin' folder on Windows
+ # Setup the variables we use from GNUInstallDirs on unix platforms
+ set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX})
+ set(CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_PREFIX})
+
+ # Don't create a <PREFIX>/pioneer subfolder to hold the data
+ set(PIONEER_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR} CACHE PATH
+ "Path where pioneer's data/ folder will be installed")
+
+ set(PIONEER_DATA_DIR ${PIONEER_INSTALL_DATADIR} CACHE PATH
+ "Runtime path to load game data from")
+else()
+ include(GNUInstallDirs)
+endif()
+
 option(PIONEER_INSTALL_INPLACE "Should an in-place install be generated" OFF)
 
 if (NOT PIONEER_INSTALL_DATADIR)
@@ -12,11 +28,6 @@ if (NOT PIONEER_INSTALL_BINDIR)
  "Path where Pioneer's executables will be installed" FORCE)
 endif (NOT PIONEER_INSTALL_BINDIR)
 
-# We don't want a 'bin' folder on Windows
-if (WIN32)
- set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX})
-endif (WIN32)
-
 # If doing an in-place installation, everything is installed in the root of the prefix
 if (PIONEER_INSTALL_INPLACE)
  set(PIONEER_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX})

src/editor/EditorIcons.h

@@ -3,32 +3,32 @@
 
 #pragma once
 
-#define EICON_SUN "\uF023"
-#define EICON_ASTEROID "\uF024"
-#define EICON_GRAVPOINT "\uF025"
-#define EICON_ROCKY_PLANET "\uF033"
-#define EICON_MOON "\uF043"
-#define EICON_GAS_GIANT "\uF053"
-#define EICON_SPACE_STATION "\uF063"
-#define EICON_SURFACE_STATION "\uF073"
-
-#define EICON_STOP "\uF054"
-#define EICON_PAUSE "\uF055"
-#define EICON_PLAY "\uF056"
-
-#define EICON_RESET "\uF05F"
-
-#define EICON_REWIND3 "\uF064"
-#define EICON_REWIND2 "\uF065"
-#define EICON_REWIND1 "\uF066"
-#define EICON_TIMESTOP "\uF067"
-#define EICON_FORWARD1 "\uF068"
-#define EICON_FORWARD2 "\uF069"
-#define EICON_FORWARD3 "\uF06A"
-
-#define EICON_INFO "\uF088"
-
-#define EICON_RANDOM "\uF0C7"
-
-#define EICON_AXES "\uF0CA"
-#define EICON_GRID "\uF0CB"
+#define EICON_SUN u8"\uF023"
+#define EICON_ASTEROID u8"\uF024"
+#define EICON_GRAVPOINT u8"\uF025"
+#define EICON_ROCKY_PLANET u8"\uF033"
+#define EICON_MOON u8"\uF043"
+#define EICON_GAS_GIANT u8"\uF053"
+#define EICON_SPACE_STATION u8"\uF063"
+#define EICON_SURFACE_STATION u8"\uF073"
+
+#define EICON_STOP u8"\uF054"
+#define EICON_PAUSE u8"\uF055"
+#define EICON_PLAY u8"\uF056"
+
+#define EICON_RESET u8"\uF05F"
+
+#define EICON_REWIND3 u8"\uF064"
+#define EICON_REWIND2 u8"\uF065"
+#define EICON_REWIND1 u8"\uF066"
+#define EICON_TIMESTOP u8"\uF067"
+#define EICON_FORWARD1 u8"\uF068"
+#define EICON_FORWARD2 u8"\uF069"
+#define EICON_FORWARD3 u8"\uF06A"
+
+#define EICON_INFO u8"\uF088"
+
+#define EICON_RANDOM u8"\uF0C7"
+
+#define EICON_AXES u8"\uF0CA"
+#define EICON_GRID u8"\uF0CB"