diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
| commit | df247efec654e512242e4f4f1b0212034f9e01fe (patch) | |
| tree | 25c02e16957f3aa613af30c140fd8e8a3d52fda6 /distribution/osx | |
| parent | d0b6a8a4ec298024f14f704f9e40a6f9d324ccf3 (diff) | |
| parent | a5ade52caa489cf0a713e0f02b764000d203140e (diff) | |
Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterdebian/1%5.2.0Beta2.1-1
Diffstat (limited to 'distribution/osx')
| -rw-r--r-- | distribution/osx/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | distribution/osx/gtk-bundle/xtrkcad-launcher.sh | 4 | ||||
| -rw-r--r-- | distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip | bin | 3990654 -> 2641265 bytes |
3 files changed, 3 insertions, 3 deletions
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 $<TARGET_FILE:xtrkcad>) 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 Binary files differindex bb6972a..2e7663b 100644 --- a/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip +++ b/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip |