diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 20 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 12 | ||||
| -rw-r--r-- | make/build-newt.xml | 6 |
3 files changed, 8 insertions, 30 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index ea56891d7..c159234ee 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1605,25 +1605,15 @@ </target> <target name="c.manifest.cg" if="jogl.cg"> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/jogl_cg.dll.manifest"/> - <arg value="-outputresource:${obj}/jogl_cg.dll;#2"/> - </exec> + <msvc.manifest objdir="${obj}" dllname="jogl_cg" /> </target> <target name="c.manifest" if="isVC8Family"> <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll --> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/jogl_gl2.dll.manifest"/> - <arg value="-outputresource:${obj}/jogl_gl2.dll;#2"/> - </exec> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/jogl_awt.dll.manifest"/> - <arg value="-outputresource:${obj}/jogl_awt.dll;#2"/> - </exec> + <msvc.manifest objdir="${obj}" dllname="jogl_es1" /> + <msvc.manifest objdir="${obj}" dllname="jogl_es2" /> + <msvc.manifest objdir="${obj}" dllname="jogl_gl2" /> + <msvc.manifest objdir="${obj}" dllname="jogl_gl2es12" /> <antcall target="c.manifest.cg" inheritRefs="true" /> </target> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 374f90b1e..496382113 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -773,16 +773,8 @@ <target name="c.manifest" if="isVC8Family"> <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll --> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/nativewindow.dll.manifest"/> - <arg value="-outputresource:${obj}/nativewindow.dll;#2"/> - </exec> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/nativewindow_awt.dll.manifest"/> - <arg value="-outputresource:${obj}/nativewindow_awt.dll;#2"/> - </exec> + <msvc.manifest objdir="${obj}" dllname="nativewindow" /> + <msvc.manifest objdir="${obj}" dllname="nativewindow_awt" /> </target> <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt"> diff --git a/make/build-newt.xml b/make/build-newt.xml index d40255c76..e13e9618e 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -521,11 +521,7 @@ <target name="c.manifest" if="isVC8Family"> <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll --> - <exec executable="mt"> - <arg value="-manifest"/> - <arg value="${obj}/newt.dll.manifest"/> - <arg value="-outputresource:${obj}/newt.dll;#2"/> - </exec> + <msvc.manifest objdir="${obj}" dllname="newt" /> </target> <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.windowlib"> |