From 33b7ed2c0498d722ec7d9629b117b4cacccdea87 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 18 May 2019 14:05:08 +0700 Subject: [PATCH 1/2] update modules --- modules/enduro2d | 2 +- scripts/update_modules.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/enduro2d b/modules/enduro2d index b0f3304..7dde063 160000 --- a/modules/enduro2d +++ b/modules/enduro2d @@ -1 +1 @@ -Subproject commit b0f3304f836fa11a1d6bbc01d1862cb8f69fa964 +Subproject commit 7dde063d8ae7c5731998b6313af252b18a8332d0 diff --git a/scripts/update_modules.sh b/scripts/update_modules.sh index 69a81a9..8ff9e6f 100755 --- a/scripts/update_modules.sh +++ b/scripts/update_modules.sh @@ -1,5 +1,3 @@ #!/bin/bash -git submodule init -git submodule update -git pull --recurse-submodules -git submodule update --init --remote --recursive +git submodule update --init --recursive +git submodule update --remote From d4135ee0849cb903c7e36f6b29b33c1247b3d0f7 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 18 May 2019 14:16:07 +0700 Subject: [PATCH 2/2] fixes after update --- .gitignore | 3 +++ CMakeLists.txt | 12 ++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b829738..907d79a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +.vs/* +.vscode/* build/* +CMakeSettings.json CMakeLists.txt.user \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d39869f..315a3d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,13 +49,5 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES # project executable # -add_executable(${PROJECT_NAME} - ${PROJECT_SOURCES}) -target_link_libraries(${PROJECT_NAME} - ${E2D_LIBRARIES}) -target_include_directories(${PROJECT_NAME} - PRIVATE ${E2D_INCLUDE_DIRS}) -set_target_properties(${PROJECT_NAME} PROPERTIES - CXX_STANDARD 14 - CXX_STANDARD_REQUIRED YES - CXX_EXTENSIONS NO) +add_executable(${PROJECT_NAME} ${PROJECT_SOURCES}) +target_link_libraries(${PROJECT_NAME} enduro2d)