gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Submodule patches now called from Makefile (e.g. make patch)

Browse Source
This commit is contained in:
Joseph Henry
2018-07-27 16:14:31 -07:00
parent c3ee25f525
commit fecb5e1b47
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -38,3 +38,7 @@ clean:
clean_win: clean_win:
-"rd /S /Q bin" -"rd /S /Q bin"
-"rd /S /Q build" -"rd /S /Q build"
patch:
git -C ext/lwip apply ../lwip.patch
git -C ext/lwip-contrib apply ../lwip-contrib.patch

2
README.md
View File

@@ -65,7 +65,7 @@ We recommend using [CMake](https://cmake.org/) for its extensive cross-platform
``` ```
git submodule init git submodule init
git submodule update git submodule update
./ext/patch_submodules.sh make patch
cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=DEBUG
cmake --build build cmake --build build
``` ```

14
ext/patch_submodules.sh
View File

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