-"%WIX%\bin\candle" cygwin.wxs\r
-"%WIX%\bin\candle" install.wxs\r
-"%WIX%\bin\candle" examples.wxs\r
-"%WIX%\bin\light" install.wixobj cygwin.wixobj examples.wixobj -ext WixUIExtension -out fio-1.44.msi
\ No newline at end of file
+@echo off\r
+setlocal enabledelayedexpansion\r
+set /a counter=4\r
+for /f "tokens=3" %%i in (..\..\fio_version.h) do (\r
+ if "!counter!"=="4" set FIO_MAJOR=%%i\r
+ if "!counter!"=="5" set FIO_MINOR=%%i\r
+ if "!counter!"=="6" set FIO_PATCH=%%i\r
+set /a counter+=1\r
+)\r
+\r
+if "%1"=="x86" set FIO_ARCH=x86\r
+if "%1"=="x64" set FIO_ARCH=x64\r
+\r
+if not defined FIO_ARCH (\r
+ echo Error: must specify the architecture.\r
+ echo Usage: dobuild x86\r
+ echo Usage: dobuild x64\r
+ goto end\r
+)\r
+\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% install.wxs\r
+@if ERRORLEVEL 1 goto end\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs\r
+@if ERRORLEVEL 1 goto end\r
+"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out fio-%FIO_MAJOR%.%FIO_MINOR%.%FIO_PATCH%-%FIO_ARCH%.msi\r
+:end
\ No newline at end of file