merge two build script into one

git-svn-id: https://emgucv.svn.sourceforge.net/svnroot/emgucv/trunk@943 d7f09016-e345-0410-b530-edf29a71df78

Build_Binary_x86-64.bat

@@ -1,33 +1 @@
-@echo off
-SET PROGRAMFILES_DIR=%programfiles(x86)%
-if NOT EXIST "%PROGRAMFILES_DIR%" SET PROGRAMFILES_DIR=%programfiles%
-
-SET CMAKE="cmake.exe"
-IF EXIST "%PROGRAMFILES_DIR%\CMake 2.6\bin\cmake.exe" SET CMAKE="%PROGRAMFILES_DIR%\CMake 2.6\bin\cmake.exe"
-IF EXIST "%PROGRAMFILES_DIR%\CMake 2.8\bin\cmake.exe" SET CMAKE="%PROGRAMFILES_DIR%\CMake 2.8\bin\cmake.exe"
-
-SET VS2005="%PROGRAMFILES_DIR%\Microsoft Visual Studio 8\Common7\IDE\devenv.exe"
-SET VS2008="%PROGRAMFILES_DIR%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe"
-SET VS2010="%PROGRAMFILES_DIR%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe"
-SET MSBUILD35="%windir%\Microsoft.NET\Framework\v3.5\MSBuild.exe"
-
-IF EXIST %MSBUILD35% SET DEVENV=%MSBUILD35%
-IF EXIST %VS2005% SET DEVENV=%VS2005% 
-IF EXIST %VS2008% SET DEVENV=%VS2008%
-IF EXIST %VS2010% SET DEVENV=%VS2010%
-
-IF %DEVENV%==%MSBUILD35% SET BUILD_TYPE=/property:Configuration=Release
-IF %DEVENV%==%VS2005% SET BUILD_TYPE=/Build Release
-IF %DEVENV%==%VS2008% SET BUILD_TYPE=/Build Release
-IF %DEVENV%==%VS2010% SET BUILD_TYPE=/Build Release
-
-IF %DEVENV%==%MSBUILD35% SET CMAKE_CONF="Visual Studio 8 2005 Win64"
-IF %DEVENV%==%VS2005% SET CMAKE_CONF="Visual Studio 8 2005 Win64"
-IF %DEVENV%==%VS2008% SET CMAKE_CONF="Visual Studio 9 2008 Win64"
-IF %DEVENV%==%VS2010% SET CMAKE_CONF="Visual Studio 10 Win64"
-
-@echo on
-del CMakeCache.txt
-%CMAKE% -G %CMAKE_CONF% -DBUILD_TESTS:BOOL=FALSE -DBUILD_NEW_PYTHON_SUPPORT:BOOL=FALSE -DOPENCV_WHOLE_PROGRAM_OPTIMIZATION:BOOL=TRUE .  
-%DEVENV% %BUILD_TYPE% emgucv.sln
-
+call Build_Binary_x86.bat 64

Build_Binary_x86.bat

@@ -1,9 +1,11 @@
 @echo off
+IF "%1%"=="64" ECHO "BUILDING 64bit solution" 
+IF NOT "%1%"=="64" ECHO "BUILDING 32bit solution"
+  
 SET PROGRAMFILES_DIR=%programfiles(x86)%
 if NOT EXIST "%PROGRAMFILES_DIR%" SET PROGRAMFILES_DIR=%programfiles%
-
+  
 SET CMAKE="cmake.exe"
-IF EXIST "%PROGRAMFILES_DIR%\CMake 2.6\bin\cmake.exe" SET CMAKE="%PROGRAMFILES_DIR%\CMake 2.6\bin\cmake.exe"
 IF EXIST "%PROGRAMFILES_DIR%\CMake 2.8\bin\cmake.exe" SET CMAKE="%PROGRAMFILES_DIR%\CMake 2.8\bin\cmake.exe"
 
 SET VS2005="%PROGRAMFILES_DIR%\Microsoft Visual Studio 8\Common7\IDE\devenv.exe"
@@ -21,10 +23,12 @@ IF %DEVENV%==%VS2005% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2008% SET BUILD_TYPE=/Build Release
 IF %DEVENV%==%VS2010% SET BUILD_TYPE=/Build Release
 
-IF %DEVENV%==%MSBUILD35% SET CMAKE_CONF="Visual Studio 8 2005"
-IF %DEVENV%==%VS2005% SET CMAKE_CONF="Visual Studio 8 2005"
-IF %DEVENV%==%VS2008% SET CMAKE_CONF="Visual Studio 9 2008"
-IF %DEVENV%==%VS2010% SET CMAKE_CONF="Visual Studio 10"
+SET OS_MODE=
+IF "%1%"=="64" SET OS_MODE= Win64
+IF %DEVENV%==%MSBUILD35% SET CMAKE_CONF="Visual Studio 8 2005%OS_MODE%"
+IF %DEVENV%==%VS2005% SET CMAKE_CONF="Visual Studio 8 2005%OS_MODE%"
+IF %DEVENV%==%VS2008% SET CMAKE_CONF="Visual Studio 9 2008%OS_MODE%"
+IF %DEVENV%==%VS2010% SET CMAKE_CONF="Visual Studio 10%OS_MODE%"
 
 @echo on
 del CMakeCache.txt