fixes after engine update

This commit is contained in:
2019-07-17 05:59:00 +07:00
parent bee68f7d5c
commit bb6759e70b
3 changed files with 20 additions and 9 deletions

View File

@@ -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
$<TARGET_FILE_DIR:${PROJECT_NAME}>/bin)
add_e2d_shared_libraries_to_target(${PROJECT_NAME})

View File

@@ -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

0
bin/.keep Normal file
View File