Browse Source

quality-of-life improvements for Visual Studio

Mark Gillard 6 years ago
parent
commit
dff92d7733
2 changed files with 8 additions and 1 deletions
  1. 7 0
      .gitignore
  2. 1 1
      include/assimp/defs.h

+ 7 - 0
.gitignore

@@ -7,6 +7,12 @@ build
 *.sln
 *.sln
 *.ncb
 *.ncb
 *.vcproj
 *.vcproj
+*.vcxproj.user
+*.VC.db
+*.VC.db-shm
+*.VC.db-wal
+*.VC.opendb
+*.ipch
 
 
 # Output
 # Output
 bin/
 bin/
@@ -32,6 +38,7 @@ cmake_uninstall.cmake
 *.dir/
 *.dir/
 assimp-config.cmake
 assimp-config.cmake
 assimp-config-version.cmake
 assimp-config-version.cmake
+assimpTargets*.cmake
 
 
 # MakeFile
 # MakeFile
 Makefile
 Makefile

+ 1 - 1
include/assimp/defs.h

@@ -293,7 +293,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _MSC_VER
 #ifndef _MSC_VER
 #  define AI_NO_EXCEPT noexcept
 #  define AI_NO_EXCEPT noexcept
 #else
 #else
-#  if (_MSC_VER == 1915 )
+#  if (_MSC_VER >= 1915 )
 #    define AI_NO_EXCEPT noexcept
 #    define AI_NO_EXCEPT noexcept
 #  else
 #  else
 #    define AI_NO_EXCEPT
 #    define AI_NO_EXCEPT