From fecb5e1b47d24a80023adf2fb0a863e084914ca1 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 27 Jul 2018 16:14:31 -0700 Subject: [PATCH] Submodule patches now called from Makefile (e.g. make patch) --- Makefile | 4 ++++ README.md | 2 +- ext/patch_submodules.sh | 14 -------------- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100755 ext/patch_submodules.sh diff --git a/Makefile b/Makefile index ac222dd..24f24d3 100644 --- a/Makefile +++ b/Makefile @@ -38,3 +38,7 @@ clean: clean_win: -"rd /S /Q bin" -"rd /S /Q build" + +patch: + git -C ext/lwip apply ../lwip.patch + git -C ext/lwip-contrib apply ../lwip-contrib.patch \ No newline at end of file diff --git a/README.md b/README.md index 4a8b257..b2b03b1 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ We recommend using [CMake](https://cmake.org/) for its extensive cross-platform ``` git submodule init git submodule update -./ext/patch_submodules.sh +make patch cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG cmake --build build ``` diff --git a/ext/patch_submodules.sh b/ext/patch_submodules.sh deleted file mode 100755 index 35dda57..0000000 --- a/ext/patch_submodules.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Execute from project root directory - -cd ext/lwip -cp ../lwip.patch . -git apply lwip.patch -cd ../.. - -cd ext/lwip-contrib -cp ../lwip-contrib.patch . -git apply lwip-contrib.patch - -cd ../..