From 3e057bfc7e77b8cdc2f83883a09f18f696db59f0 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Wed, 14 Mar 2012 01:11:07 +0100
Subject: [PATCH] Windows support

---
 .gitignore  | 11 ++++++
 smjs.gyp    | 41 ++++++++++++++++++++--
 vcbuild.bat | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 vcbuild.bat

diff --git a/.gitignore b/.gitignore
index b6eb5bc3..782f6dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,17 @@
 *.a
 *.mk
 *.Makefile
+*.opensdf
+*.sdf
+*.sln
+*.suo
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+/build/gyp
+/Debug
 /gyp-mac-tool
+/ipch
 /Makefile
 /out
+/Release
diff --git a/smjs.gyp b/smjs.gyp
index a22defc8..68bc6058 100644
--- a/smjs.gyp
+++ b/smjs.gyp
@@ -50,6 +50,9 @@
       'JS_METHODJIT=1',
       'JS_DEFAULT_JITREPORT_GRANULARITY=3',
       'JSGC_INCREMENTAL=1',
+      'IMPL_MFBT=1',
+      # This implies building a static library
+      'STATIC_JS_API=1',
     ],
 
     # XXX I have frankly no idea what JS_NUNBOX32 and JS_PUNBOX64 *really* do
@@ -100,7 +103,38 @@
       }],
       ['OS == "win"', {
         'include_dirs': ['config/windows'],
-        'defines': ['XP_WIN=1'],
+        'defines': [
+          'WIN32=1',
+          'XP_WIN=1',
+          'HAVE_GETSYSTEMTIMEASFILETIME=1',
+          'HAVE_SYSTEMTIMETOFILETIME=1',
+          'WIN32_LEAN_AND_MEAN=1',
+        ],
+        'conditions': [
+          ['target_arch == "ia32"', {
+            'defines': [
+              '_X86_=1'
+            ],
+          }],
+          ['target_arch == "x64"', {
+            'defines': [
+              '_AMD64_=1',
+              '_M_AMD64_=1'
+            ],
+          }],
+        ],
+        'msvs_cygwin_shell': 0, # don't use bash
+        'msvc_disable_warnings': [
+          '4800', # warning C4800: 'variable' : forcing value to bool 'true' or
+                  # 'false' (performance warning)
+        ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'AdditionalOptions': [
+              '/MP', # compile across multiple CPUs
+            ],
+          },
+        }
       }, {
         'cflags': [
           # -Wno-invalid-offsetof disables warnings when offsetof() is used
@@ -188,9 +222,12 @@
 
       'conditions': [
         ['OS == "win"', {
+          'link_settings':  {
+            'libraries': [ '-lwinmm.lib' ],
+          },
           'sources': [
             'src/assembler/jit/ExecutableAllocatorWin.cpp',
-            'src/yarr/OSAllocatorPosix.cpp',
+            'src/yarr/OSAllocatorWin.cpp',
           ],
         }, {
           'sources': [
diff --git a/vcbuild.bat b/vcbuild.bat
new file mode 100644
index 00000000..373b79cb
--- /dev/null
+++ b/vcbuild.bat
@@ -0,0 +1,99 @@
+@echo off
+
+cd %~dp0
+
+if /i "%1"=="help" goto help
+if /i "%1"=="--help" goto help
+if /i "%1"=="-help" goto help
+if /i "%1"=="/help" goto help
+if /i "%1"=="?" goto help
+if /i "%1"=="-?" goto help
+if /i "%1"=="--?" goto help
+if /i "%1"=="/?" goto help
+
+@rem Process arguments.
+set config=Debug
+set target=Build
+set target_arch=ia32
+set noprojgen=
+set nobuild=
+
+:next-arg
+if "%1"=="" goto args-done
+if /i "%1"=="debug"         set config=Debug&goto arg-ok
+if /i "%1"=="release"       set config=Release&goto arg-ok
+if /i "%1"=="clean"         set target=Clean&goto arg-ok
+if /i "%1"=="ia32"          set target_arch=ia32&goto arg-ok
+if /i "%1"=="x86"           set target_arch=ia32&goto arg-ok
+if /i "%1"=="x64"           set target_arch=x64&goto arg-ok
+if /i "%1"=="noprojgen"     set noprojgen=1&goto arg-ok
+if /i "%1"=="nobuild"       set nobuild=1&goto arg-ok
+
+echo Warning: ignoring invalid command line option `%1`.
+
+:arg-ok
+shift
+goto next-arg
+:args-done
+
+:project-gen
+@rem Skip project generation if requested.
+if defined noprojgen goto msbuild
+
+@rem Generate the VS project.
+if exist build\gyp goto have_gyp
+if not exist build mkdir build
+echo git clone https://github.com/martine/gyp.git build/gyp
+call git clone https://github.com/martine/gyp.git build/gyp
+if errorlevel 1 goto gyp_install_failed
+goto have_gyp
+
+:gyp_install_failed
+echo Failed to download gyp. Make sure you have git installed, or
+echo manually install gyp into %~dp0build\gyp.
+goto exit
+
+:have_gyp
+call build\gyp\gyp.bat smjs.gyp -f msvs -G msvs_version=2010 --depth=. -Dtarget_arch=%target_arch% -Dlibrary=static_library
+if errorlevel 1 goto create-msvs-files-failed
+if not exist smjs.sln goto create-msvs-files-failed
+echo Project files generated.
+
+:msbuild
+@rem Skip project generation if requested.
+if defined nobuild goto run
+
+@rem Bail out early if not running in VS build env.
+if defined VCINSTALLDIR goto msbuild-found
+if not defined VS100COMNTOOLS goto msbuild-not-found
+if not exist "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
+call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:msbuild-not-found
+echo Build skipped. To build, this file needs to run from VS cmd prompt.
+goto run
+
+:msbuild-found
+@rem Build the sln with msbuild.
+msbuild smjs.sln /m /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
+if errorlevel 1 goto exit
+
+:run
+@rem Nothing to run yet
+goto exit
+
+:create-msvs-files-failed
+echo Failed to create vc project files.
+goto exit
+
+:help
+echo vcbuild.bat [debug/release] [clean] [noprojgen] [nobuild]
+echo Examples:
+echo   vcbuild.bat        : Build debug build.
+echo   vcbuild.bat nobuild: Generate visual studio project, don't build.
+echo   vcbuild.bat release: Build release build.
+goto exit
+
+:exit