diff --git a/CMakeLists.txt b/CMakeLists.txt index cee0269ea..8580e2169 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,27 +3,22 @@ cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR) if (APPLE) # # The following variables define the portability and compatability attributes of the Mac OS X build - # they are choosen with care and should not be changed without good cause. Note that they preclude - # doing a default build on OS X 10.7 since there is no 10.9 SDK available for Mac OS X 10.7. This doesn't - # preclude builds on newer versions of OS X being installed on Mac OS X 10.7, in fact it is exacty these - # options that ensure offcial build run on 10.7 and newer versions of Mac OS X. At some point it may - # be that some new version cannot be supported as well as 10.7, at that point the deployment target below - # must be moved on to 10.8 and we can no longer support Mac OS X 10.7. + # they are choosen with care and should not be changed without good cause. # # Among other things these options are chosen to match the portability and compatability options of the # Qt framework dylibs which can be checked as follows: # # otool -l | grep -A3 LC_VERSION_MIN_MACOSX # - set (CMAKE_OSX_DEPLOYMENT_TARGET 10.7 + set (CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "Earliest version of OS X supported -Earliest version we can support with C++11 & libc++ is 10.7. +Earliest version we can support with Qt 5.8, C++11 & libc++ is 10.9. Do not override this if you intend to build an official deployable installer.") - set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk + set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk CACHE STRING "Mac OS X SDK to build with -Change this to the newest SDK available that you can install on your system (10.9 preferred). +Change this to the newest SDK available that you can install on your system (10.11 preferred). Do not override this if you intend to build an official deployable installer.") endif (APPLE) diff --git a/Darwin/developer read me.txt b/Darwin/developer read me.txt index 9c472db98..a7615f53f 100644 --- a/Darwin/developer read me.txt +++ b/Darwin/developer read me.txt @@ -36,9 +36,6 @@ hdiutil resize -sectors 110000 rw.dmg # now you can mount the R/W DMG hdiutil attach rw.dmg -# change the hidden attribute on the background PNG -chflags nohidden /Volumes/WSJT-X/background.png - # make the .DS_Store file writeable chmod 644 /Volumes/WSJT-X/.DS_Store @@ -48,11 +45,8 @@ chmod 644 /Volumes/WSJT-X/.DS_Store # to the DMG root folder, you need to have changed the install steps before doing this # procedure so the content changes are reflected in the installer DMG you start with. -# when you are happy with the layout etc. close the Finder window to ensure all -# changes are saved. - -# set the background PNG as a hidden file -chflags hidden /Volumes/WSJT-X/background.png +# when you are happy with the layout etc. move the Finder window by any amount, this +# ensures that the .DS_Store file is updated from Finder's cache. # make the .DS_Store file read only chmod 444 /Volumes/WSJT-X/.DS_Store diff --git a/Darwin/wsjtx_DMG.DS_Store b/Darwin/wsjtx_DMG.DS_Store index 6c324f13b..e062a5281 100644 Binary files a/Darwin/wsjtx_DMG.DS_Store and b/Darwin/wsjtx_DMG.DS_Store differ