diff options
| author | Kenneth Russel <[email protected]> | 2008-08-29 19:45:55 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-08-29 19:45:55 +0000 |
| commit | 3cbb77e3407b0409b21da0bfc977b9c2f5eefe8e (patch) | |
| tree | 555904f3c6235d7ccae4a62c47b252f4ad97d1e9 | |
| parent | 80672213c63260d1016c0673c6e1e8e07524322b (diff) | |
Fixed detection of Mac OS X Universal (which is the only flavor now supported)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/branches/JOGL_2_SANDBOX@114 a78bb65f-1512-4460-ba86-f6dc96a7bf27
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index 631d0e3..6d9393c 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -303,16 +303,9 @@ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os.2" /> - <target name="gluegen.cpptasks.detect.os.osx.ppc" unless="gluegen.cpptasks.detected.os.2" if="isOSXPPC"> - <property name="os.and.arch" value="macosx-ppc" /> - </target> - - <target name="gluegen.cpptasks.detect.os.osx.universal" unless="gluegen.cpptasks.detected.os.2" if="isOSXUniversal"> - <property name="os.and.arch" value="macosx-universal" /> - </target> - - <target name="gluegen.cpptasks.detect.os.osx" depends="gluegen.cpptasks.detect.os.osx.ppc,gluegen.cpptasks.detect.os.osx.universal" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> + <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> <property name="native.library.suffix" value="*lib" /> + <property name="os.and.arch" value="macosx-universal" /> </target> <target name="gluegen.cpptasks.detect.os.solaris.sparc" unless="gluegen.cpptasks.detected.os.2" if="isSolarisSparc"> |