Changeset 1965


Ignore:
Timestamp:
Oct 2, 2012, 5:55:37 PM (5 years ago)
Author:
sam
Message:

build: add a script to automatically run bitten on Windows. Needs some tweaking
before it also runs on Linux or OS X.

Location:
trunk/build
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/Makefile.am

    r1923 r1965  
    33
    44EXTRA_DIST = lol-build \
    5              check-source.sh \
     5             check-source.sh run-bitten.sh \
    66             build-linux build-mingw build-mingw64 build-ps3 \
    77             build-nacl32 build-nacl64 \
  • trunk/build/lol-build

    r1931 r1965  
    6161      [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
    6262      *) cpu_count="$(CPUInfo.exe | sed -ne 's/CPU Cores.* \([0-9][0-9]*\)/\1/p')" ;;
     63    esac
     64    # Otherwise, Windows may define NUMBER_OF_PROCESSORS
     65    case "$cpu_count" in
     66      [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
     67      *) cpu_count="$NUMBER_OF_PROCESSORS" ;;
    6368    esac
    6469    # Otherwise, be conservative and assume 1 CPU core
  • trunk/build/vs2010/Lol.sln

    r1955 r1965  
    532532                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Any CPU.ActiveCfg = Debug|Win32
    533533                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
    534                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|x64
     534                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|PS3
     535                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.Build.0 = Debug|PS3
    535536                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32
    536537                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.Build.0 = Debug|Win32
    537538                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64
    538539                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64
    539                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|x64
     540                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
     541                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
     542                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
    540543                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Any CPU.ActiveCfg = Release|Win32
    541544                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Mixed Platforms.ActiveCfg = Release|Win32
    542                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|x64
     545                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|PS3
     546                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.Build.0 = Release|PS3
    543547                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.ActiveCfg = Release|Win32
    544548                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.Build.0 = Release|Win32
    545549                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.ActiveCfg = Release|x64
    546550                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.Build.0 = Release|x64
    547                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|x64
     551                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
     552                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Build.0 = Release|Xbox 360
     553                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
    548554                {58922993-9830-4A40-B462-0326342F69ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    549555                {58922993-9830-4A40-B462-0326342F69ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.