Merge branch 'master' into mingw-dev

This is a fast forward merge, but we use '--no-ff' to avoid fast-forward

LICENSE

@@ -0,0 +1,8 @@
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

MiniEngine.h

@@ -1,9 +1,20 @@
 #pragma once
+
+#ifdef _MSC_VER
+/// Visual Studio (VC++ Compiler)
+#include <SDL.h>
+#undef main
+#include <SDL_image.h>
+#include <SDL_ttf.h>
+#include <SDL_mixer.h>
+#else
+/// CodeBlocks (MinGW Compiler)
 #include <SDL2/SDL.h>
 #undef main
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_ttf.h>
 #include <SDL2/SDL_mixer.h>
+#endif
 
 #include <string>
 #include <memory>

README.md

@@ -4,7 +4,8 @@ A C++ Mini Engine. Based on SDL2.
 
 C++编写的SDL2引擎.  
 
-**可能存在的错误**:由于Widget体系尚未构建完全，使用时可能出现问题。若只使用MiniEngine主体则不会出现问题。  
+**可能存在的错误**: 由于Event和Widget体系尚未构建完全，使用时可能出现问题(包括未解决的编译错误)。若只使用MiniEngine主体则不会出现问题。  
+**重要提示**: master分支为稳定分支,dev分支为开发分支.  
 
 ### 编译说明
 
@@ -15,6 +16,8 @@ Windows: 请使用Codeblocks 16.01(推荐)载入所有.cpp文件.接下来Codebl
 > SDL2 Mixer (SDL2_mixer.lib)  
 > SDL2 TTF (SDL2_ttf.lib)  
 
+Windows-Visual Studio: 使用VS编译本项目可能会出现某些错误,目前还没有很好的解决办法.  
+
 C4droid: 长按编译键选择编译模式为Makefile. 选择编译目标为SDL2 Application. 修改程序名称为program_name(此处与makefile对应即可)
 > 依赖库  
 > C4droid本体  
@@ -23,3 +26,8 @@ C4droid: 长按编译键选择编译模式为Makefile. 选择编译目标为SDL2
 
 [前往SDL2官网下载最新版本](http://www.libsdl.org/download-2.0.php)  
 [C4droid on GooglePlay](https://play.google.com/store/apps/details?id=com.n0n3m4.droidc&hl=en)  
+
+##### 依赖库下载地址
+[SDL2_image下载地址](https://www.libsdl.org/projects/SDL_image/)  
+[SDL2_mixer下载地址](https://www.libsdl.org/projects/SDL_mixer/)  
+[SDL2_ttf下载地址](https://www.libsdl.org/projects/SDL_ttf/)