diff options
| author | Kenneth Russel <[email protected]> | 2006-12-20 19:52:54 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-12-20 19:52:54 +0000 |
| commit | bd207dd065b5e2f506e5d3ae22e9102cba2be92e (patch) | |
| tree | 89ea6714a66f02059f42773230a932ebc1cb4706 /make | |
| parent | b3c5539bf36dd30fb5d0b7f6f939ce057e98fd55 (diff) | |
Fixed problem on Win64 where manifest was not being created for
jogl_cg.dll
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1032 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index a10a11563..91545b81b 100644 --- a/make/build.xml +++ b/make/build.xml @@ -905,7 +905,6 @@ <param name="output.lib.name" value="jogl_awt"/> <param name="linker.cfg.id" value="${linker.cfg.id.core}"/> </antcall> - <antcall target="c.manifest" inheritRefs="true" /> </target> <target name="c.build.jogl.cg" if="jogl.cg"> @@ -917,6 +916,14 @@ </antcall> </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> + </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"> @@ -929,6 +936,7 @@ <arg value="${obj}/jogl_awt.dll.manifest"/> <arg value="-outputresource:${obj}/jogl_awt.dll;#2"/> </exec> + <antcall target="c.manifest.cg" inheritRefs="true" /> </target> <target name="c.build.jogl" depends="c.build.jogl.core,c.build.jogl.awt,c.build.jogl.cg"> |