diff --git a/CMakeLists.txt b/CMakeLists.txt index b24c93267..a01129418 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac endif() # set up versioning. -set(DF_VERSION "0.40.19") +set(DF_VERSION "0.40.23") SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") @@ -188,5 +188,10 @@ ELSEIF(WIN32) SET(CPACK_GENERATOR "ZIP") ENDIF() set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) -set(CPACK_PACKAGE_FILE_NAME "dfhack-${DFHACK_VERSION}-${CMAKE_SYSTEM_NAME}") +IF(APPLE) + set(DFHACK_PACKAGE_PLATFORM_NAME OSX) +ELSE() + set(DFHACK_PACKAGE_PLATFORM_NAME ${CMAKE_SYSTEM_NAME}) +ENDIF() +set(CPACK_PACKAGE_FILE_NAME "dfhack-${DFHACK_VERSION}-${DFHACK_PACKAGE_PLATFORM_NAME}") INCLUDE(CPack) diff --git a/Compile.html b/Compile.html index 623c087ac..07b128db5 100644 --- a/Compile.html +++ b/Compile.html @@ -469,9 +469,10 @@ This will take some time—maybe hours, depending on your machine.
diff --git a/Compile.rst b/Compile.rst index 9e301239e..9a6d2f8a2 100644 --- a/Compile.rst +++ b/Compile.rst @@ -106,9 +106,10 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa Option 2: Using Homebrew: * `Install Homebrew `_ and run: + * ``brew tap lethosor/gcc`` * ``brew install git`` * ``brew install cmake`` - * ``brew install gcc45 --enable-multilib`` + * ``brew install lethosor/gcc/gcc45 --enable-multilib`` 5. Install perl dependencies diff --git a/Contributors.html b/Contributors.html index cfdf78775..702f40b1a 100644 --- a/Contributors.html +++ b/Contributors.html @@ -403,6 +403,13 @@ ul.auto-toc {
  • Angus Mezick <amezick@gmail.com>
  • PeridexisErrant <PeridexisErrant@gmail.com>
  • Putnam
  • +
  • Danaris
  • +
  • Lethosor
  • +
  • Eswald
  • +
  • Ramblurr
  • +
  • MithrilTuxedo
  • +
  • AndreasPK
  • +
  • cdombroski
  • And those are the cool people who made stonesense.