Skip to content
Permalink
Browse files

Fix CMake on Windows

  • Loading branch information
SupSuper committed Nov 25, 2019
1 parent 1b61fdd commit 564f58c1a3a5f21dc7552542c03eb409cdd44be5
Showing with 5 additions and 1 deletion.
  1. +2 −1 CMakeLists.txt
  2. +3 −0 src/CMakeLists.txt
@@ -46,7 +46,7 @@ endif ()
set ( DEPS_DIR "${default_deps_dir}" CACHE STRING "Dependencies directory" )

# Add check for library (SDL_gfx, yaml-cpp )
if ( IS_DIRECTORY ${DEPS_DIR} )
if ( IS_DIRECTORY ${DEPS_DIR}/include )
include_directories ( ${DEPS_DIR}/include/SDL ${DEPS_DIR}/include/yaml-cpp ${DEPS_DIR}/include )
if ( CMAKE_CL_64 )
link_directories ( ${DEPS_DIR}/lib/x64 )
@@ -59,6 +59,7 @@ if ( IS_DIRECTORY ${DEPS_DIR} )
set ( SDLIMAGE_LIBRARY SDL_image )
set ( YAMLCPP_LIBRARY yaml-cpp )
set ( YAMLCPP_LIBRARY_DEBUG yaml-cppd )
add_definitions( -DYAML_CPP_DLL )
else ( )
find_package ( SDL2 COMPONENTS mixer gfx image)
find_package ( Yaml_cpp 0.5.3)
@@ -411,6 +411,9 @@ if ( MSVC )
if ( FATAL_WARNING )
add_definitions ( /WX )
endif ( FATAL_WARNING )
set ( CMAKE_EXE_LINKER_FLAGS "/manifest:no" )
set ( CMAKE_MODULE_LINKER_FLAGS "/manifest:no" )
set ( CMAKE_SHARED_LINKER_FLAGS="/manifest:no" )
endif ()

if ( WIN32 )

0 comments on commit 564f58c

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