Changeset 0a3bbb2


Ignore:
Timestamp:
Jun 12, 2011 12:12:58 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
654aa59
Parents:
462d4fb
Message:

Preliminary jbigi support for osx. jcpuid will be coming later.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/freenet/support/CPUInformation/CPUID.java

    r462d4fb r0a3bbb2  
    5656    private static final boolean isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd");
    5757    private static final boolean isSunos = System.getProperty("os.name").toLowerCase().contains("sunos");
     58    private static final boolean isMac = System.getProperty("os.name").startsWith("Mac");
    5859
    5960
     
    429430        if(isWindows)
    430431             return "jcpuid-x86-windows"; // The convention on Windows
     432        if(isMac) {
     433            if(isX86) {
     434                return "jcpuid-x86-osx";  // The convention on Intel Macs
     435            }
     436        }
    431437        if(isFreebsd)
    432438            return "jcpuid-x86-freebsd"; // The convention on freebsd...
     
    444450        if(isFreebsd)
    445451            return "jcpuid-x86_64-freebsd";
     452        if(isMac)
     453            return "jcpuid-x86_64-osx";
    446454        if(isSunos)
    447455            return "jcpuid-x86_64-solaris";
     
    454462        if(isWindows)
    455463            return "dll";
    456         else
     464        if(isMac)
     465            return "jnilib";
     466        else
    457467            return "so";
    458468    }
Note: See TracChangeset for help on using the changeset viewer.