Changeset 1965Tweet

Timestamp:

Oct 2, 2012, 5:55:37 PM (8 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:

• Makefile.am (modified) (1 diff)
• lol-build (modified) (1 diff)
• run-bitten.sh (added)
• vs2010/Lol.sln (modified) (1 diff)

trunk/build/Makefile.am

@@ -3 +3 @@
 
 EXTRA_DIST = lol-build \
-             check-source.sh \
+             check-source.sh run-bitten.sh \
              build-linux build-mingw build-mingw64 build-ps3 \
              build-nacl32 build-nacl64 \

trunk/build/lol-build

@@ -61 +61 @@
       [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
       *) cpu_count="$(CPUInfo.exe | sed -ne 's/CPU Cores.* \([0-9][0-9]*\)/\1/p')" ;;
+    esac
+    # Otherwise, Windows may define NUMBER_OF_PROCESSORS
+    case "$cpu_count" in
+      [1-9]|[1-9][0-9]|[1-9][0-9][0-9]) ;;
+      *) cpu_count="$NUMBER_OF_PROCESSORS" ;;
     esac
     # Otherwise, be conservative and assume 1 CPU core

trunk/build/vs2010/Lol.sln

@@ -532 +532 @@
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Any CPU.ActiveCfg = Debug|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|x64
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.ActiveCfg = Debug|PS3
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|PS3.Build.0 = Debug|PS3
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.Build.0 = Debug|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64
-                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|x64
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Any CPU.ActiveCfg = Release|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|x64
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.ActiveCfg = Release|PS3
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|PS3.Build.0 = Release|PS3
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.ActiveCfg = Release|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.Build.0 = Release|Win32
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.ActiveCfg = Release|x64
                 {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.Build.0 = Release|x64
-                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|x64
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Build.0 = Release|Xbox 360
+                {5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
                 {58922993-9830-4A40-B462-0326342F69ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {58922993-9830-4A40-B462-0326342F69ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU