aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-01-23 10:12:44 +0100
committerSven Gothel <[email protected]>2023-01-23 10:12:44 +0100
commit6a5e104d784a09c03525d4c40d83ad4696601a67 (patch)
tree1e0a17c1f9f21bac66b1a3d728e16030be13ce8f /make
parentbd2004b140f12afeb2e2337a1b426a212b1ba492 (diff)
Remove Windows dll-rename, adopting to cpptasks.jar change
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml11
-rw-r--r--make/build-nativewindow.xml11
-rw-r--r--make/build-newt.xml11
-rw-r--r--make/build-oculusvr.xml11
4 files changed, 0 insertions, 44 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index d792831fd..79e16933c 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1525,10 +1525,6 @@
<target name="c.configure" depends="c.configure.1,c.configure.2" />
- <target name="rename.mingw.dll" if="isMingW">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<!-- Only compile the ffmpeg version depending source files
against their respective header files!
We do not use the resulting static libraries directly,
@@ -1742,13 +1738,6 @@
</linker>
</cc>
- <!-- FIXME: this is a hack; the cpptask should have an option to change the
- suffix or at least understand the override from so to dll -->
- <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" />
- </antcall>
-
<gluegen.make.libsymbols builddir="${build}"
nativelib="${obj.jogl}/${native.library.prefix}@{output.lib.name}.${native.library.suffix}"
symbolsfile="${obj.jogl}/${native.library.prefix}@{output.lib.name}.symbols"/>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index e682bc68e..37dfee998 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -813,10 +813,6 @@
<target name="c.configure" depends="c.configure.1,c.configure.2" />
- <target name="rename.mingw.dll" if="isMingW">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<macrodef name="c.build">
<attribute name="c.compiler.src.files" />
<attribute name="compiler.cfg.id" />
@@ -946,13 +942,6 @@
</linker>
</cc>
- <!-- FIXME: this is a hack; the cpptask should have an option to change the
- suffix or at least understand the override from so to dll -->
- <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" />
- </antcall>
-
<gluegen.make.libsymbols builddir="${build}"
nativelib="${obj.nativewindow}/${native.library.prefix}@{output.lib.name}.${native.library.suffix}"
symbolsfile="${obj.nativewindow}/${native.library.prefix}@{output.lib.name}.symbols"/>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 49715f143..8df13ae49 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -876,10 +876,6 @@
<target name="c.configure" depends="c.configure.1,c.configure.2" />
- <target name="rename.mingw.dll" if="isMingW">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<macrodef name="c.build">
<attribute name="c.compiler.src.files" />
<attribute name="compiler.cfg.id" />
@@ -986,13 +982,6 @@
</linker>
</cc>
- <!-- FIXME: this is a hack; the cpptask should have an option to change the
- suffix or at least understand the override from so to dll -->
- <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" />
- </antcall>
-
<gluegen.make.libsymbols builddir="${build}"
nativelib="${obj.newt}/${native.library.prefix}@{output.lib.name}.${native.library.suffix}"
symbolsfile="${obj.newt}/${native.library.prefix}@{output.lib.name}.symbols"/>
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index 655ddf008..9750dad2d 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -409,10 +409,6 @@
<target name="c.configure" depends="c.configure.1,c.configure.2" />
- <target name="rename.mingw.dll" if="isMingW">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<macrodef name="c.build">
<attribute name="compiler.cfg.id" />
<attribute name="linker.cfg.id" />
@@ -657,13 +653,6 @@
</linker>
</cc>
- <!-- FIXME: this is a hack; the cpptask should have an option to change the
- suffix or at least understand the override from so to dll -->
- <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" />
- </antcall>
-
<!-- this stripping may be called more than once on the same library dir,
but that should cause no harm, and doing it here inside outofdate
prevents the JARs from always being rebuilt even if no source code changes -->