diff options
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index d0e6b9a..b967a91 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -185,7 +185,7 @@ <condition property="isWindowsAMD64"> <and> <istrue value="${isWindows}" /> - <os arch="amd64" /> + <os arch="amd64" /> </and> </condition> <condition property="isFreeBSDX86"> @@ -350,7 +350,6 @@ <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX"> <property name="native.library.suffix" value="*lib" /> - <property name="native.library.suffix-cdc" value="so" /> <property name="os.and.arch" value="macosx-universal" /> </target> @@ -374,7 +373,6 @@ <target name="gluegen.cpptasks.detect.os.unix" unless="gluegen.cpptasks.detected.os.2" if="isUnix"> <property name="native.library.suffix" value="so" /> - <property name="native.library.suffix-cdc" value="so" /> </target> <target name="gluegen.cpptasks.detect.os.windows.amd64" unless="gluegen.cpptasks.detected.os.2" if="isWindowsAMD64"> @@ -387,7 +385,6 @@ <target name="gluegen.cpptasks.detect.os.windows" depends="gluegen.cpptasks.detect.os.windows.amd64,gluegen.cpptasks.detect.os.windows.x86" unless="gluegen.cpptasks.detected.os.2" if="isWindows"> <property name="native.library.suffix" value="dll" /> - <property name="native.library.suffix-cdc" value="dll" /> </target> <target name="gluegen.cpptasks.detect.os.2" depends="gluegen.cpptasks.detect.os.freebsd,gluegen.cpptasks.detect.os.hpux,gluegen.cpptasks.detect.os.linux,gluegen.cpptasks.detect.os.osx,gluegen.cpptasks.detect.os.solaris,gluegen.cpptasks.detect.os.unix,gluegen.cpptasks.detect.os.windows" unless="gluegen.cpptasks.detected.os.2"> @@ -607,37 +604,33 @@ </defineset> </compiler> -<!-- - SOLARIS is currently disabled .. - - <compiler id="compiler.cfg.solaris" name="suncc"> - <defineset> - <define name="SOLARIS" /> - </defineset> + <!-- SOLARIS compiler configuration --> + + <compiler id="compiler.cfg.solaris" name="gcc"> + <defineset> + <define name="SOLARIS" /> + </defineset> + </compiler> + + <compiler id="compiler.cfg.solaris.sparcv9" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=ultra" /> + <compilerarg value="-xarch=v9a" /> + <defineset> + <define name="SOLARIS" /> + </defineset> + </compiler> + + <compiler id="compiler.cfg.solaris.amd64" name="gcc"> + <compilerarg value="-fast" /> + <compilerarg value="-xchip=opteron" /> + <compilerarg value="-xarch=amd64" /> + <compilerarg value="-xcache=64/64/2:1024/64/16" /> + <defineset> + <define name="SOLARIS" /> + </defineset> </compiler> - <compiler id="compiler.cfg.solaris.sparcv9" name="suncc"> - <compilerarg value="-fast" /> - <compilerarg value="-xchip=ultra" /> - <compilerarg value="-xarch=v9a" /> - <defineset> - <define name="SOLARIS" /> - </defineset> - </compiler> - - <compiler id="compiler.cfg.solaris.amd64" name="suncc"> - <compilerarg value="-fast" /> - <compilerarg value="-xchip=opteron" /> - <compilerarg value="-xarch=amd64" /> - --> - <!-- <compilerarg value="-xcache=64/64/2:1024/64/16" /> --> -<!-- - <defineset> - <define name="SOLARIS" /> - </defineset> - </compiler> - --> - <!-- MacOSX compiler configuration --> <compiler id="compiler.cfg.macosx" name="gcc"> @@ -755,20 +748,18 @@ <linkerarg value="-m64"/> </linker> -<!-- - SOLARIS is currently unsupported + <!-- SOLARIS linker configuration --> - <linker id="linker.cfg.solaris" name="suncc"> - </linker> + <linker id="linker.cfg.solaris" name="gcc"> + </linker> - <linker id="linker.cfg.solaris.sparcv9" name="suncc"> - <linkerarg value="-xarch=v9a" /> - </linker> + <linker id="linker.cfg.solaris.sparcv9" name="gcc"> + <linkerarg value="-xarch=v9a" /> + </linker> - <linker id="linker.cfg.solaris.amd64" name="suncc"> - <linkerarg value="-xarch=amd64" /> + <linker id="linker.cfg.solaris.amd64" name="gcc"> + <linkerarg value="-xarch=amd64" /> </linker> ---> <!-- MacOSX linker configuration --> |