Index: .github/workflows/nightly-macos.yml =================================================================== --- .github/workflows/nightly-macos.yml (revisión: 9884) +++ .github/workflows/nightly-macos.yml (copia de trabajo) @@ -12,34 +12,24 @@ - name: install_dependencies run: | - #curl http://www.libsdl.org/release/SDL2-2.0.10.dmg > SDL2-2.0.10.dmg - #hdiutil attach SDL2-2.0.10.dmg >>/dev/stderr - #sudo cp -R -v /Volumes/SDL2/SDL2.framework /Library/Frameworks/ - #sudo ls /Library/Frameworks/ >>/dev/stderr - #hdiutil eject /Volumes/SDL2 >>/dev/stderr - brew install autoconf automake freetype libpng pkg-config sdl2 + brew install cmake pkg-config libpng sdl2 freetype fluidsynth - name: build run: | - autoreconf -ivf - ./configure CC=clang - make BACKEND=sdl2 MULTI_THREAD=1 OPTIMISE=1 OSTYPE=mac USE_FREETYPE=1 USE_UPNP=0 USE_ZSTD=0 AV_FOUNDATION=1 - make OSX/getversion + mkdir build && cd build + cmake -DCMAKE_BUILD_TYPE=Release .. + cmake --build . --target install - name: distribute - run: sh ./distribute.sh + run: | + cd build + zip -r simumac-nightly.zip simutrans - - name: Rename result - run: | - ls *.zip >>/dev/stderr - echo "LATEST=$(ls *.zip)" >> $GITHUB_ENV - mv sim*.zip simumac-nightly.zip - - name: Update binaries of Nightly Release uses: svenstaro/upload-release-action@v1-release with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./simumac-nightly.zip + file: build/simumac-nightly.zip asset_name: simumac-nightly.zip tag: Nightly overwrite: true Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revisión: 9884) +++ CMakeLists.txt (copia de trabajo) @@ -176,7 +176,7 @@ if (MINGW) target_link_libraries(simutrans PRIVATE ${Freetype_STATIC_LIBRARIES}) elseif (APPLE) - target_link_libraries(simutrans PRIVATE ${SDL2_LIBRARIES}) + target_link_libraries(simutrans PRIVATE ${Freetype_LIBRARIES}) else () target_link_libraries(simutrans PRIVATE Freetype::Freetype) endif () Index: cmake/MacBundle.cmake =================================================================== --- cmake/MacBundle.cmake (revisión: 9884) +++ cmake/MacBundle.cmake (copia de trabajo) @@ -25,6 +25,9 @@ MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION} ) +# Change the install directory from /usr/local to the build directory, so it's easier to package. +set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) + install(CODE " include(BundleUtilities) fixup_bundle(\"${CMAKE_BINARY_DIR}/simutrans/simutrans.app\" \"\" \"\")