Attachment 807 Details for Bug 1316 – JOGL patch

[patch] JOGL patch

jogl1316.patch (text/plain), 7.63 KB, created by Julien Gouesse on 2019-03-29 20:38:05 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Gouesse

Created: 2019-03-29 20:38:05 CET

Size: 7.63 KB

patch

obsolete

>diff --git a/make/build-jogl.xml b/make/build-jogl.xml
>index 0f1b435c2..0ad2569d4 100644
>--- a/make/build-jogl.xml
>+++ b/make/build-jogl.xml
>@@ -1435,10 +1435,6 @@
>         <move file="${src}" tofile="${dest}" />
>     </target>
> 
>-    <target name="rename.dylib" if="isOSX">
>-        <move file="${src}" tofile="${dest}" />
>-    </target>
>-
>     
>-            <antcall target="rename.dylib" inheritRefs="true">
>-                <param name="src"  value="${obj.jogl}/lib@{output.lib.name}.dylib" />
>-                <param name="dest" value="${obj.jogl}/lib@{output.lib.name}.jnilib" />
>-            </antcall>
>-    
>-            
>             <antcall target="rename.mingw.dll" inheritRefs="true">
>                 <param name="src"  value="${obj.jogl}/lib@{output.lib.name}.so" />
>                 <param name="dest" value="${obj.jogl}/@{output.lib.name}.dll" />
>diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
>index b4d7858a7..697040918 100644
>--- a/make/build-nativewindow.xml
>+++ b/make/build-nativewindow.xml
>@@ -616,10 +616,6 @@
>         <move file="${src}" tofile="${dest}" />
>     </target>
> 
>-    <target name="rename.dylib" if="isOSX">
>-        <move file="${src}" tofile="${dest}" />
>-    </target>
>-
>     <macrodef name="c.build">
>       <attribute name="c.compiler.src.files" />
>       <attribute name="compiler.cfg.id" />
>@@ -688,7 +684,7 @@
>           <targetfiles>
>             <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.so"/>
>             <fileset dir="${obj.nativewindow}" includes="@{output.lib.name}.dll"/>
>-            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.jnilib"/>
>+            <fileset dir="${obj.nativewindow}" includes="lib@{output.lib.name}.dylib"/>
>           </targetfiles>
>           <sequential>
>             <cc outtype="shared" 
>@@ -729,13 +725,6 @@
> 
>             
>-            <antcall target="rename.dylib" inheritRefs="true">
>-                <param name="src"  value="${obj.nativewindow}/lib@{output.lib.name}.dylib" />
>-                <param name="dest" value="${obj.nativewindow}/lib@{output.lib.name}.jnilib" />
>-            </antcall>
>-
>-            
>             <antcall target="rename.mingw.dll" inheritRefs="true">
>                 <param name="src"  value="${obj.nativewindow}/lib@{output.lib.name}.so" />
>                 <param name="dest" value="${obj.nativewindow}/@{output.lib.name}.dll" />
>diff --git a/make/build-newt.xml b/make/build-newt.xml
>index 733d5aebd..dd6037d98 100644
>--- a/make/build-newt.xml
>+++ b/make/build-newt.xml
>@@ -620,10 +620,6 @@
>         <move file="${src}" tofile="${dest}" />
>     </target>
> 
>-    <target name="rename.dylib" if="isOSX">
>-        <move file="${src}" tofile="${dest}" />
>-    </target>
>-
>     <macrodef name="c.build">
>       <attribute name="c.compiler.src.files" />
>       <attribute name="compiler.cfg.id" />
>@@ -672,7 +668,7 @@
>           <targetfiles>
>             <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.so"/>
>             <fileset dir="${obj.newt}" includes="@{output.lib.name}.dll"/>
>-            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.jnilib"/>
>+            <fileset dir="${obj.newt}" includes="lib@{output.lib.name}.dylib"/>
>           </targetfiles>
>           <sequential>
>             <cc outtype="shared"
>@@ -718,13 +714,6 @@
>     
>             
>-            <antcall target="rename.dylib" inheritRefs="true">
>-                <param name="src"  value="${obj.newt}/lib@{output.lib.name}.dylib" />
>-                <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
>-            </antcall>
>-    
>-            
>             <antcall target="rename.mingw.dll" inheritRefs="true">
>                 <param name="src"  value="${obj.newt}/lib@{output.lib.name}.so" />
>                 <param name="dest" value="${obj.newt}/@{output.lib.name}.dll" />
>diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
>index b89b66fb7..a2564c944 100644
>--- a/make/build-oculusvr.xml
>+++ b/make/build-oculusvr.xml
>@@ -411,10 +411,6 @@
>         <move file="${src}" tofile="${dest}" />
>     </target>
> 
>-    <target name="rename.dylib" if="isOSX">
>-        <move file="${src}" tofile="${dest}" />
>-    </target>
>-
>     <macrodef name="c.build">
>       <attribute name="compiler.cfg.id" />
>       <attribute name="linker.cfg.id" />
>@@ -530,7 +526,7 @@
>           <targetfiles>
>             <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.so"/>
>             <fileset dir="${obj.oculusvr}" includes="@{output.lib.name}.dll"/>
>-            <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.jnilib"/>
>+            <fileset dir="${obj.oculusvr}" includes="lib@{output.lib.name}.dylib"/>
>           </targetfiles>
>           <sequential>
>             
>@@ -661,13 +657,6 @@
>     
>             
>-            <antcall target="rename.dylib" inheritRefs="true">
>-                <param name="src"  value="${obj.oculusvr}/lib@{output.lib.name}.dylib" />
>-                <param name="dest" value="${obj.oculusvr}/lib@{output.lib.name}.jnilib" />
>-            </antcall>
>-    
>-            
>             <antcall target="rename.mingw.dll" inheritRefs="true">
>                 <param name="src"  value="${obj.oculusvr}/lib@{output.lib.name}.so" />
>                 <param name="dest" value="${obj.oculusvr}/@{output.lib.name}.dll" />

Actions: View | Diff

Attachments on bug 1316: 804 | 805 | 806 | 807