Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAKE: updated target for sdl2 update

master
Martin Gerhardy 2021-02-17 22:19:38 +01:00
parent 511b0e66d1
commit b4e7e6a9fc
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -59,8 +59,6 @@ option(THUMBNAILER "Builds thumbnailer" ON)
option(VOXCONVERT "Builds voxconvert" ON)
option(MAPVIEW "Builds mapview" ON)
option(NOISETOOL "Builds noisetool" ON)
set(GIT_EXECUTABLE "git" CACHE STRING "The git binary to use for the update-libs target")
set(HG_EXECUTABLE "hg" CACHE STRING "The mercurial binary to use for the update-libs target")
option(USE_CCACHE "Use ccache" ON)
option(USE_GPROF "Use gprof - will become slow" OFF)
option(USE_GCOV "Use gcov - will become slow" OFF)

10
Makefile
View File

@ -60,14 +60,6 @@ define UPDATE_GIT
fi;
endef
define UPDATE_HG
$(Q)if [ ! -d $(UPDATEDIR)/$(1).sync ]; then \
hg clone $(2) $(UPDATEDIR)/$(1).sync; \
else \
cd $(UPDATEDIR)/$(1).sync && hg pull && hg update; \
fi;
endef
update-libuv:
$(call UPDATE_GIT,libuv,https://github.com/libuv/libuv.git)
rm -rf contrib/libs/libuv/include/uv/*.[ch]
@ -140,7 +132,7 @@ update-glm:
rm contrib/libs/glm/glm/CMakeLists.txt
update-sdl2:
$(call UPDATE_HG,sdl2,https://hg.libsdl.org/SDL)
$(call UPDATE_GIT,sdl2,https://github.com/libsdl-org/SDL.git)
rm -rf contrib/libs/sdl2/src/* contrib/libs/sdl2/include/* contrib/libs/sdl2/cmake/*
cp -r $(UPDATEDIR)/sdl2.sync/src/* contrib/libs/sdl2/src
cp -r $(UPDATEDIR)/sdl2.sync/wayland-protocols/* contrib/libs/sdl2/wayland-protocols