Skip to content

Commit

Permalink
Move to statically linked externals
Browse files Browse the repository at this point in the history
  • Loading branch information
alanjfs committed Jan 15, 2020
1 parent c15925e commit fb9c453
Show file tree
Hide file tree
Showing 695 changed files with 224,144 additions and 14 deletions.
24 changes: 10 additions & 14 deletions Example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ else()
endif()

include_directories(
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015/${CONFIGURATION}/include
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015/${CONFIGURATION}/include/MagnumExternal/OpenGL
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015-static/${CONFIGURATION}/include
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015-static/${CONFIGURATION}/include/MagnumExternal/OpenGL
${CMAKE_SOURCE_DIR}/External/magnum-singles
${CMAKE_SOURCE_DIR}/External/imgui/x64-windows/include
${CMAKE_SOURCE_DIR}/External/entt
${CMAKE_SOURCE_DIR}/../
)

link_directories(
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015/${CONFIGURATION}/lib
${CMAKE_SOURCE_DIR}/External/magnum/x64-windows-vs2015-static/${CONFIGURATION}/lib
)


Expand Down Expand Up @@ -63,7 +63,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_options(${PROJECT_NAME} PRIVATE /std:c++17 /MDd /Zi /EHsc)
else()
target_compile_definitions(${PROJECT_NAME} PRIVATE -DNDEBUG)
target_compile_options(${PROJECT_NAME} PRIVATE /std:c++17 /Od /EHsc /wd4251 /MP /MD)
target_compile_options(${PROJECT_NAME} PRIVATE /std:c++17 /EHsc /wd4251 /MP /MD)
endif()

# Magnum suffixes libraries for debug builds
Expand All @@ -74,15 +74,11 @@ else()
endif()

target_link_libraries(${PROJECT_NAME}
CorradePluginManager${MAGNUM_LIB_SUFFIX}
CorradeUtility${MAGNUM_LIB_SUFFIX}
CorradeUtility
glfw3
Magnum${MAGNUM_LIB_SUFFIX}
MagnumGL${MAGNUM_LIB_SUFFIX}
MagnumMeshTools${MAGNUM_LIB_SUFFIX}
MagnumPrimitives${MAGNUM_LIB_SUFFIX}
MagnumGlfwApplication${MAGNUM_LIB_SUFFIX}
MagnumShaders${MAGNUM_LIB_SUFFIX}
MagnumTrade${MAGNUM_LIB_SUFFIX}
MagnumImGuiIntegration${MAGNUM_LIB_SUFFIX}
opengl32
Magnum
MagnumGL
MagnumGlfwApplication
MagnumImGuiIntegration
)
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
provides=BmpImporter
provides=GifImporter
provides=HdrImporter
provides=JpegImporter
provides=PgmImporter
provides=PicImporter
provides=PngImporter
provides=PpmImporter
provides=PsdImporter
provides=TgaImporter
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit fb9c453

Please sign in to comment.