diff options
Diffstat (limited to 'cad/sweethome3d/files/patch-build.xml')
| -rw-r--r-- | cad/sweethome3d/files/patch-build.xml | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml index 887430040876..88ab2adcf8d1 100644 --- a/cad/sweethome3d/files/patch-build.xml +++ b/cad/sweethome3d/files/patch-build.xml @@ -1,15 +1,28 @@ ---- build.xml.orig 2017-02-01 12:42:14 UTC +--- build.xml.orig 2022-07-13 08:03:06 UTC +++ build.xml -@@ -271,12 +271,6 @@ - <fileset dir="build"> +@@ -512,7 +512,6 @@ --> + <zipfileset src="build/Help.jar"/> + <fileset dir="lib"> + <include name="*.jar"/> +- <include name="macosx/*.jar"/> + <include name="java3d-1.6/*.jar"/> + <exclude name="java3d-1.6/jogl-all.jar"/> + </fileset> +@@ -520,15 +519,8 @@ --> <include name="java3d-1.6/jogl-java3d.jar"/> </fileset> -- <fileset dir="lib"> + <fileset dir="lib"> +- <include name="windows/**/*.dll"/> - <include name="java3d-1.6/windows/**/*.dll"/> +- <include name="yafaray/windows/**/*.dll"/> +- <include name="linux/**/*.so"/> - <include name="java3d-1.6/linux/**/*.so"/> +- <include name="yafaray/linux/**/*.so"/> - <include name="macosx/*.jnilib"/> - <include name="java3d-1.6/macosx/*.dylib"/> -- </fileset> - </jar> - </target> - +- <include name="yafaray/macosx/**/*.dylib"/> ++ <include name="yafaray/*.so"/> ++ <include name="yafaray/yafaray-plugins/*.so"/> + </fileset> + <fileset dir="libtest"> + <include name="jnlp.jar"/> |