diff --git a/headers/3rdparty/variant/config.hpp b/headers/3rdparty/variant/config.hpp index 0d741793..cf919d85 100644 --- a/headers/3rdparty/variant/config.hpp +++ b/headers/3rdparty/variant/config.hpp @@ -39,7 +39,7 @@ #endif #if defined(__cpp_constexpr) && __cpp_constexpr >= 201304 && \ - !(defined(_MSC_VER) && _MSC_VER <= 1915) + (defined(_MSC_VER) && _MSC_VER != 1915) #define MPARK_CPP14_CONSTEXPR #endif diff --git a/modules/glfw b/modules/glfw index 5595fa3a..d9466050 160000 --- a/modules/glfw +++ b/modules/glfw @@ -1 +1 @@ -Subproject commit 5595fa3ae60386bdb6ae4caf8f488779e3c342a3 +Subproject commit d9466050d9f61699f3ecba5ab2ca8a0a774dff53 diff --git a/modules/variant b/modules/variant index ac41b45c..1a861281 160000 --- a/modules/variant +++ b/modules/variant @@ -1 +1 @@ -Subproject commit ac41b45c744861116a0484cb17f336310a5ffd99 +Subproject commit 1a861281fc1c6fd2037d050a70ff53dcbb635d93 diff --git a/scripts/update_modules.sh b/scripts/update_modules.sh index 6abb7a51..effae0aa 100755 --- a/scripts/update_modules.sh +++ b/scripts/update_modules.sh @@ -23,10 +23,10 @@ mkdir -p $UNTESTS_DIR/catch cp -fv $MODULES_DIR/catch2/single_include/catch2/catch.hpp $UNTESTS_DIR/catch/catch.hpp mkdir -p $SOURCES_RDPARTY_DIR/glfw -cp -rfv $MODULES_DIR/glfw/include/GLFW/ $SOURCES_RDPARTY_DIR/glfw/ +cp -rfv $MODULES_DIR/glfw/include/GLFW/. $SOURCES_RDPARTY_DIR/glfw/ mkdir -p $SOURCES_RDPARTY_DIR/glew -cp -rfv $MODULES_DIR/glew/include/GL/ $SOURCES_RDPARTY_DIR/glew/ +cp -rfv $MODULES_DIR/glew/include/GL/. $SOURCES_RDPARTY_DIR/glew/ mkdir -p $SOURCES_RDPARTY_DIR/stb cp -fv $MODULES_DIR/stb/stb_image.h $SOURCES_RDPARTY_DIR/stb/stb_image.h @@ -37,7 +37,7 @@ cp -fv $MODULES_DIR/stb/stb_sprintf.h $SOURCES_RDPARTY_DIR/stb/stb_sprintf.h cp -fv $MODULES_DIR/stb/stb_truetype.h $SOURCES_RDPARTY_DIR/stb/stb_truetype.h mkdir -p $SOURCES_RDPARTY_DIR/utfcpp -cp -rfv $MODULES_DIR/utfcpp/source/ $SOURCES_RDPARTY_DIR/utfcpp/ +cp -rfv $MODULES_DIR/utfcpp/source/. $SOURCES_RDPARTY_DIR/utfcpp/ mkdir -p $HEADERS_RDPARTY_DIR/variant -cp -rfv $MODULES_DIR/variant/include/mpark/ $HEADERS_RDPARTY_DIR/variant/ +cp -rfv $MODULES_DIR/variant/include/mpark/. $HEADERS_RDPARTY_DIR/variant/