diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 11:03:47 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 22:02:38 -0500 |
| commit | e1c6f3bf6ca32503dadd4a8fe431a1a7a47f64a1 (patch) | |
| tree | e5b09881b787a8eaf47c36ee458cdb4ee48e4804 | |
| parent | 74becec17f91bcbd3ad7edf466721fa0405b8b67 (diff) | |
change packaging of GTK rc file for OS X and Linux.
I cannot find the equivalent location for Windows
| -rwxr-xr-x | tools/linux_packaging/build | 9 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 11 |
2 files changed, 3 insertions, 17 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 132d9449f3..f1bc92733d 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -220,7 +220,6 @@ if test x$MIXBUS != x ; then # echo export ARDOUR_KEYBOARD_LAYOUT=us-nokeypad >> $ENVIRONMENT echo export ARDOUR_UI_CONF=ardour3_ui.conf >> $ENVIRONMENT - echo export ARDOUR3_UI_RC=ardour3_ui_dark.rc >> $ENVIRONMENT fi # @@ -542,13 +541,7 @@ echo "Copying other stuff to $APPDIR ..." cp $BUILD_ROOT/gtk2_ardour/mnemonic-us.bindings $Etc cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc cp ../../system_config $Etc/system_config -cp $BUILD_ROOT/gtk2_ardour/ui_dark.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/light_fonts.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/dark_fonts.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/light_styles.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/dark_styles.rc $Etc -cp $BUILD_ROOT/gtk2_ardour/widgets.rc $Etc +cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc # these are copied straight from the source tree diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index c6dfc2bb36..6bbf6176a0 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -167,7 +167,6 @@ if test x$SAE != x ; then # env="$env<key>ARDOUR_KEYBOARD_LAYOUT</key><string>de-nokeypad</string>" env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui_sae.conf</string>" - env="$env<key>ARDOUR3_UI_RC</key><string>ardour3_ui_dark_sae.rc</string>" elif test x$MIXBUS != x ; then appname="Ardour3/Mixbus" env="$env<key>ARDOUR_MIXBUS</key><string>true</string>" @@ -176,7 +175,6 @@ elif test x$MIXBUS != x ; then # env="$env<key>ARDOUR_KEYBOARD_LAYOUT</key><string>us-nokeypad</string>" env="$env<key>ARDOUR_UI_CONF</key><string>ardour3_ui.conf</string>" - env="$env<key>ARDOUR3_UI_RC</key><string>ardour3_ui_dark.rc</string>" else appname="Ardour3" fi @@ -462,13 +460,8 @@ else echo cp ../../instant.xml $Resources/instant.xml fi cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Resources -cp $BUILD_ROOT/gtk2_ardour/dark_fonts.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/dark_styles.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/light_fonts.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/light_styles.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/ui_dark.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/ui_light.rc $Resources -cp $BUILD_ROOT/gtk2_ardour/widgets.rc $Resources +cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources + cp -r ../../gtk2_ardour/icons $Resources cp -r ../../gtk2_ardour/pixmaps $Resources |