Skip to content
Permalink
Browse files

Moved assimp to Lib files.

  • Loading branch information...
Angelo1211 committed Nov 8, 2018
1 parent 6f0f739 commit c9e72d08829972f585c5520e0ba5479fdb606c18
Showing with 16,512 additions and 66 deletions.
  1. +2 −1 .gitignore
  2. +2 −2 CMakeLists.txt
  3. +8 −0 libs/assimp/include/assimp/.editorconfig
  4. +22 −0 libs/assimp/include/assimp/Compiler/poppack1.h
  5. +912 −0 libs/assimp/include/assimp/Compiler/pstdint.h
  6. +43 −0 libs/assimp/include/assimp/Compiler/pushpack1.h
  7. +141 −0 libs/assimp/include/assimp/DefaultIOStream.h
  8. +99 −0 libs/assimp/include/assimp/DefaultIOSystem.h
  9. +191 −0 libs/assimp/include/assimp/DefaultLogger.hpp
  10. +49 −0 libs/assimp/include/assimp/Defines.h
  11. +483 −0 libs/assimp/include/assimp/Exporter.hpp
  12. +140 −0 libs/assimp/include/assimp/IOStream.hpp
  13. +359 −0 libs/assimp/include/assimp/IOSystem.hpp
  14. +653 −0 libs/assimp/include/assimp/Importer.hpp
  15. +110 −0 libs/assimp/include/assimp/LogStream.hpp
  16. +268 −0 libs/assimp/include/assimp/Logger.hpp
  17. +98 −0 libs/assimp/include/assimp/NullLogger.hpp
  18. +126 −0 libs/assimp/include/assimp/ProgressHandler.hpp
  19. +400 −0 libs/assimp/include/assimp/SceneCombiner.h
  20. +53 −0 libs/assimp/include/assimp/ai_assert.h
  21. +572 −0 libs/assimp/include/assimp/anim.h
  22. +225 −0 libs/assimp/include/assimp/camera.h
  23. +263 −0 libs/assimp/include/assimp/cexport.h
  24. +137 −0 libs/assimp/include/assimp/cfileio.h
  25. +564 −0 libs/assimp/include/assimp/cimport.h
  26. +104 −0 libs/assimp/include/assimp/color4.h
  27. +204 −0 libs/assimp/include/assimp/color4.inl
  28. +963 −0 libs/assimp/include/assimp/config.h
  29. +963 −0 libs/assimp/include/assimp/config.h.in
  30. +290 −0 libs/assimp/include/assimp/defs.h
  31. +145 −0 libs/assimp/include/assimp/importerdesc.h
  32. +258 −0 libs/assimp/include/assimp/light.h
  33. +1,564 −0 libs/assimp/include/assimp/material.h
  34. +389 −0 libs/assimp/include/assimp/material.inl
  35. +182 −0 libs/assimp/include/assimp/matrix3x3.h
  36. +356 −0 libs/assimp/include/assimp/matrix3x3.inl
  37. +279 −0 libs/assimp/include/assimp/matrix4x4.h
  38. +681 −0 libs/assimp/include/assimp/matrix4x4.inl
  39. +773 −0 libs/assimp/include/assimp/mesh.h
  40. +314 −0 libs/assimp/include/assimp/metadata.h
  41. +92 −0 libs/assimp/include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h
  42. +645 −0 libs/assimp/include/assimp/postprocess.h
  43. +129 −0 libs/assimp/include/assimp/quaternion.h
  44. +285 −0 libs/assimp/include/assimp/quaternion.inl
  45. +384 −0 libs/assimp/include/assimp/scene.h
  46. +217 −0 libs/assimp/include/assimp/texture.h
  47. +518 −0 libs/assimp/include/assimp/types.h
  48. +116 −0 libs/assimp/include/assimp/vector2.h
  49. +227 −0 libs/assimp/include/assimp/vector2.inl
  50. +145 −0 libs/assimp/include/assimp/vector3.h
  51. +260 −0 libs/assimp/include/assimp/vector3.inl
  52. +108 −0 libs/assimp/include/assimp/version.h
  53. BIN libs/assimp/lib64/assimp-vc140-mt.dll
  54. BIN libs/assimp/lib64/assimp-vc140-mt.exp
  55. BIN libs/assimp/lib64/assimp-vc140-mt.lib
  56. BIN libs/assimp/lib64/assimp-vc140-mtd.dll
  57. BIN libs/assimp/lib64/assimp-vc140-mtd.exp
  58. BIN libs/assimp/lib64/assimp-vc140-mtd.lib
  59. +0 −62 libs/glm/CMakeLists.txt
  60. +1 −1 modules/Findassimp.cmake
@@ -1,4 +1,5 @@
build/
.vscode/
/CMakeSettings.json
/.vs
/.vs
*.pdb
@@ -10,7 +10,7 @@ if(WIN32)
# using Intel C++ (Does nothing yet)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(SDL2_PATH "C:\\vs_dev_lib\\SDL2-2.0.8-MSVC")
set(ASSIMP_PATH "C:\\vs_dev_lib\\ASSIMP-MSVC")
set(ASSIMP_ROOT_DIR "${CMAKE_SOURCE_DIR}/libs/assimp")
endif()
endif()
# Picking correct sdl2 lib for each compiler for the windwos version
@@ -21,7 +21,7 @@ find_package(SDL2 REQUIRED)
include_directories(${SDL2_INCLUDE_DIR} include libs)

find_package(ASSIMP REQUIRED)
include_directories(${ASSIMP_INCLUDE_DIR} )
include_directories(${ASSIMP_INCLUDE_DIR} include libs )

# Some useful compiler flags
#-fopt-info-vec-all -xCORE-AVX2 -no-prec-sqrt -g -ffast-math -static -static-libgcc -static-libstdc++
@@ -0,0 +1,8 @@
# See <http://EditorConfig.org> for details

[*.{h,hpp,inl}]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space
@@ -0,0 +1,22 @@

// ===============================================================================
// May be included multiple times - resets structure packing to the defaults
// for all supported compilers. Reverts the changes made by #include <pushpack1.h>
//
// Currently this works on the following compilers:
// MSVC 7,8,9
// GCC
// BORLAND (complains about 'pack state changed but not reverted', but works)
// ===============================================================================

#ifndef AI_PUSHPACK_IS_DEFINED
# error pushpack1.h must be included after poppack1.h
#endif

// reset packing to the original value
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
# pragma pack( pop )
#endif
#undef PACK_STRUCT

#undef AI_PUSHPACK_IS_DEFINED

0 comments on commit c9e72d0

Please sign in to comment.
You can’t perform that action at this time.