From bb6759e70bb8351c7ca1da3ff04e732db7145010 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Wed, 17 Jul 2019 05:59:00 +0700 Subject: [PATCH] fixes after engine update --- CMakeLists.txt | 27 +++++++++++++++++++-------- LICENSE.md | 2 +- bin/.keep | 0 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 bin/.keep diff --git a/CMakeLists.txt b/CMakeLists.txt index 315a3d9..9432619 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.11 FATAL_ERROR) project(enduro2d-bootstrap) # -# linking mode +# linking # if(MSVC) - option(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC runtime library DLL" OFF) - if(NOT USE_MSVC_RUNTIME_LIBRARY_DLL) + option(BUILD_WITH_STATIC_CRT "Use static C runtime library" ON) + if(BUILD_WITH_STATIC_CRT) foreach(flag CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE @@ -29,15 +29,16 @@ if(MSVC) endif() # -# include enduro2d +# enduro2d # -set(E2D_BUILD_SAMPLES OFF CACHE BOOL "" FORCE) -set(E2D_BUILD_UNTESTS OFF CACHE BOOL "" FORCE) +set(E2D_BUILD_SAMPLES OFF CACHE INTERNAL "" FORCE) +set(E2D_BUILD_UNTESTS OFF CACHE INTERNAL "" FORCE) +set(E2D_BUILD_WITH_STATIC_CRT ${BUILD_WITH_STATIC_CRT} CACHE INTERNAL "" FORCE) add_subdirectory(modules/enduro2d) # -# project sources +# sources # file(GLOB_RECURSE PROJECT_SOURCES @@ -46,8 +47,18 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${PROJECT_SOURCES}) # -# project executable +# executable # add_executable(${PROJECT_NAME} ${PROJECT_SOURCES}) target_link_libraries(${PROJECT_NAME} enduro2d) + +# +# resources +# + +add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_CURRENT_SOURCE_DIR}/bin + $/bin) +add_e2d_shared_libraries_to_target(${PROJECT_NAME}) diff --git a/LICENSE.md b/LICENSE.md index 9a7e454..7b1f40a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Matvey Cherevko +Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/bin/.keep b/bin/.keep new file mode 100644 index 0000000..e69de29