From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Aug 2020 11:53:00 +0200 Subject: New upstream version 5.2.0Beta2.1 --- distribution/osx/CMakeLists.txt | 2 +- distribution/osx/gtk-bundle/xtrkcad-launcher.sh | 4 ++-- .../osx/gtk-bundle/xtrkcad-template.dmg.zip | Bin 3990654 -> 2641265 bytes 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'distribution/osx') diff --git a/distribution/osx/CMakeLists.txt b/distribution/osx/CMakeLists.txt index 2561fae..6e4dd05 100644 --- a/distribution/osx/CMakeLists.txt +++ b/distribution/osx/CMakeLists.txt @@ -1,5 +1,5 @@ # Automatically generate most of our external dependencies ... -GET_TARGET_PROPERTY(XTRKCAD_LOCATION xtrkcad LOCATION) +SET(XTRKCAD_LOCATION $) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake" @ONLY) INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake") diff --git a/distribution/osx/gtk-bundle/xtrkcad-launcher.sh b/distribution/osx/gtk-bundle/xtrkcad-launcher.sh index 30988e5..69aac1e 100755 --- a/distribution/osx/gtk-bundle/xtrkcad-launcher.sh +++ b/distribution/osx/gtk-bundle/xtrkcad-launcher.sh @@ -36,7 +36,7 @@ if type -p "X" & > /dev/null; then fi #XTRKCAD_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/XTrackCAD//'`" -XTRKCAD_BUNDLE="$bundle" +XTRKCAD_BUNDLE="`echo "$bundle" | sed -e 's_/Contents/MacOS/XTrackCAD_/_'`" XTRKCAD_RESOURCES="$XTRKCAD_BUNDLE/Contents/Resources" XTRKCAD_TEMP="/tmp/xtrkcad/$UID" XTRKCAD_ETC="$XTRKCAD_TEMP/etc" @@ -52,7 +52,7 @@ export GTK_DATA_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" -export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" +# export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" XTRKCAD_PANGO_RC_FILE="$XTRKCAD_RESOURCES/etc/pango/pangorc" I18NDIR="$bundle_data/locale" diff --git a/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip b/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip index bb6972a..2e7663b 100644 Binary files a/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip and b/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip differ -- cgit v1.2.3