From ce11aa51f5085e76303ad5c26318cad7a7cbbd62 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Mon, 7 May 2018 00:07:41 +0200
Subject: [PATCH] add win32-based make script.

---
 code/ObjFileImporter.cpp          | 29 ++++++++++++-----------------
 tools/make/make_all_win32_x64.bat | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 tools/make/make_all_win32_x64.bat

diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp
index dd0733caa..cbf2363a4 100644
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -76,41 +76,36 @@ using namespace std;
 
 // ------------------------------------------------------------------------------------------------
 //  Default constructor
-ObjFileImporter::ObjFileImporter() :
-    m_Buffer(),
-    m_pRootObject( NULL ),
-    m_strAbsPath( "" )
-{
+ObjFileImporter::ObjFileImporter()
+: m_Buffer()
+, m_pRootObject( nullptr )
+, m_strAbsPath( "" ) {
     DefaultIOSystem io;
     m_strAbsPath = io.getOsSeparator();
 }
 
 // ------------------------------------------------------------------------------------------------
 //  Destructor.
-ObjFileImporter::~ObjFileImporter()
-{
+ObjFileImporter::~ObjFileImporter() {
     delete m_pRootObject;
-    m_pRootObject = NULL;
+    m_pRootObject = nullptr;
 }
 
 // ------------------------------------------------------------------------------------------------
 //  Returns true, if file is an obj file.
-bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem*  pIOHandler , bool checkSig ) const
-{
-    if(!checkSig) //Check File Extension
-    {
+bool ObjFileImporter::CanRead( const std::string& pFile, IOSystem*  pIOHandler , bool checkSig ) const {
+    if(!checkSig)  {
+        //Check File Extension
         return SimpleExtensionCheck(pFile,"obj");
-    }
-    else //Check file Header
-    {
+    } else {
+        // Check file Header
         static const char *pTokens[] = { "mtllib", "usemtl", "v ", "vt ", "vn ", "o ", "g ", "s ", "f " };
         return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, pTokens, 9 );
     }
 }
 
 // ------------------------------------------------------------------------------------------------
-const aiImporterDesc* ObjFileImporter::GetInfo () const
-{
+const aiImporterDesc* ObjFileImporter::GetInfo () const {
     return &desc;
 }
 
diff --git a/tools/make/make_all_win32_x64.bat b/tools/make/make_all_win32_x64.bat
new file mode 100644
index 000000000..d4561df0d
--- /dev/null
+++ b/tools/make/make_all_win32_x64.bat
@@ -0,0 +1,16 @@
+rem @echo off
+call build_env_win32.bat
+
+set BUILD_CONFIG=release
+set PLATFORM_CONFIG=x64
+set MAX_CPU_CONFIG=4
+
+set CONFIG_PARAMETER=/p:Configuration="%BUILD_CONFIG%"
+set PLATFORM_PARAMETER=/p:Platform="%PLATFORM_CONFIG%"
+set CPU_PARAMETER=/maxcpucount:%MAX_CPU_CONFIG%
+set PLATFORM_TOOLSET=/p:PlatformToolset=%PLATFORM_VER%
+
+pushd ..\..\
+cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64"
+%MSBUILD% assimp.sln %CONFIG_PARAMETER% %PLATFORM_PARAMETER% %CPU_PARAMETER% %PLATFORM_TOOLSET%
+popd