Merge branch 'illwieckz/files'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dbdb887ec1d2deb67ac5a88a211c640bc2eeb92..587152162741bd156a37f5600bd441cea3aa2e66 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ if (BUILD_RADIANT)
 endif ()
 
 if (CMAKE_EXECUTABLE_SUFFIX)
-    set(RADIANT_EXECUTABLE ${CMAKE_EXECUTABLE_SUFFIX})
+    string(REGEX REPLACE "^[.]" "" RADIANT_EXECUTABLE ${CMAKE_EXECUTABLE_SUFFIX})
 else ()
     execute_process(
             COMMAND uname -m

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 9978092e01472eb37e0841714299931c0bf30bb2..147cfa98762e7842f734be9f8fdedbc02e839b1f 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -1820,7 +1820,7 @@ const char* map_import( const char* title ){
 }
 
 const char* map_save( const char* title ){
-       return file_dialog( GTK_WIDGET( MainFrame_getWindow() ), TRUE, title, getLastFolderPath(), MapFormat::Name(), false, true, false );
+       return file_dialog( GTK_WIDGET( MainFrame_getWindow() ), FALSE, title, getLastFolderPath(), MapFormat::Name(), false, false, true );
 }
 
 void OpenMap(){

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 94cbbe5bd19c60071fc0b6c6187c3bcf5168e4b8..ad32a079e7a66bbd3aa0f74058771393c3e50553 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,7 +2,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 
 macro(radiant_tool name)
     add_executable(${name} ${ARGN})
-    if (NOT (CMAKE_EXECUTABLE_SUFFIX STREQUAL RADIANT_EXECUTABLE))
+    if (NOT (CMAKE_EXECUTABLE_SUFFIX STREQUAL ".${RADIANT_EXECUTABLE}"))
         add_custom_command(TARGET ${name} POST_BUILD
                 COMMAND ln -f -s "$<TARGET_FILE_NAME:${name}>" "${PROJECT_BINARY_DIR}/${name}.${RADIANT_EXECUTABLE}"
                 VERBATIM