[PATCH v2] Link to marbledata when building out of tree

Lubomir I. Ivanov neolit123 at gmail.com
Tue Mar 18 11:35:07 PDT 2014


On 18 March 2014 19:59, Anton Lundin <glance at acc.umu.se> wrote:
> When building and running subsurface out of tree, marbledata was
> inaccessible to subsurface.
>
> Signed-off-by: Anton Lundin <glance at acc.umu.se>
> ---
>  subsurface.pro | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/subsurface.pro b/subsurface.pro
> index 988161f..98f23b7 100644
> --- a/subsurface.pro
> +++ b/subsurface.pro
> @@ -208,6 +208,10 @@ doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation || $(MKDIR) $$OUT_PWD/
>  all.depends += doc
>  QMAKE_EXTRA_TARGETS += doc all
>
> +marbledata.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/marbledata || $(COPY_DIR) $$PWD/marbledata $$OUT_PWD
> +all.depends += marbledata
> +QMAKE_EXTRA_TARGETS += marbledata
> +
>  DESKTOP_FILE = subsurface.desktop
>  mac: ICON = packaging/macosx/Subsurface.icns
>  else: ICON = subsurface-icon.svg


i think the patch is fine and if it works OK for you on linux that's
the most important part.

on native windows i get a:
make marbledata
mingw32-make: Nothing to be done for `marbledata'.

but the folder is not in the output path where the .exe is.
perhaps i'm doing something wrong, but that's not an issue for me at least.

lubomir
--


More information about the subsurface mailing list