diff options
| author | Kenneth Russel <[email protected]> | 2004-08-04 20:08:51 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2004-08-04 20:08:51 +0000 |
| commit | 72c9b6009048bcbafa8a8621d4d248fe7cad4645 (patch) | |
| tree | cbd2e5a0da41a88d54173b86be6280c5d37eb3b7 | |
| parent | e26c0e6cca27dc6f6209c68b5a39331998bf77f0 (diff) | |
Fixed Solaris portion of cpptasks port; needed to add a new suncc
compiler/linker type to cpptasks. Updated cpptasks jar file. Filed
patch request in ant-contrib project on sourceforge.net; bug ID
1003528.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@146 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 5 | ||||
| -rwxr-xr-x | make/lib/cpptasks-cvs-040628.jar | bin | 306355 -> 335649 bytes |
2 files changed, 3 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index e1d6645ad..127124bd9 100644 --- a/make/build.xml +++ b/make/build.xml @@ -652,7 +652,8 @@ <!-- compiler configuration --> <compiler id="compiler.cfg.linux" name="gcc" /> - <compiler id="compiler.cfg.solaris" name="CC"/> + <compiler id="compiler.cfg.solaris" name="suncc"> + </compiler> <compiler id="compiler.cfg.win32.mingw" name="gcc"> <defineset> @@ -705,7 +706,7 @@ </linker> <linker id="linker.cfg.solaris"> - <syslibset dir="/usr/X11R6/lib" libs="GL, GLU, X11"/> + <syslibset libs="GL, GLU, X11"/> </linker> <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false"> diff --git a/make/lib/cpptasks-cvs-040628.jar b/make/lib/cpptasks-cvs-040628.jar Binary files differindex f827a4f0f..01e20f93f 100755 --- a/make/lib/cpptasks-cvs-040628.jar +++ b/make/lib/cpptasks-cvs-040628.jar |