diff options
| author | Kenneth Russel <[email protected]> | 2008-07-03 20:51:23 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-07-03 20:51:23 +0000 |
| commit | 670ab23389eb4305c1da440ab50b4b850c16ebac (patch) | |
| tree | 727dcff32104882c926fb5acf3ce2ec851ed5887 /make/build.xml | |
| parent | ac240e183c70dae6264a6c47cd35c44fdb6bd6b1 (diff) | |
Fixed references to output.lib.name in c.build macrodef
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1706 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index d6d47d617..af5c27f21 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1279,7 +1279,7 @@ <include name="${rootrel.generated.c.cg}/*.c"/> </patternset> - <echo message="Compiling ${output.lib.name}" /> + <echo message="Compiling @{output.lib.name}" /> <cc outtype="shared" objdir="${obj.jogl}" @@ -1330,15 +1330,15 @@ <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${build}/obj/lib${output.lib.name}.dylib" /> - <param name="dest" value="${build}/obj/lib${output.lib.name}.jnilib" /> + <param name="src" value="${build}/obj/lib@{output.lib.name}.dylib" /> + <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" /> </antcall> <!-- FIXME: this is a hack; the cpptask should have an option to change the suffix or at least understand the override from dylib to jnilib --> <antcall target="rename.mingw.dll" inheritRefs="true"> - <param name="src" value="${build}/lib${output.lib.name}.so" /> - <param name="dest" value="${build}/${output.lib.name}.dll" /> + <param name="src" value="${build}/obj/lib@{output.lib.name}.so" /> + <param name="dest" value="${build}/obj/@{output.lib.name}.dll" /> </antcall> </sequential> </macrodef> |