diff --git a/Makefile b/Makefile index 6f01c7b4..7e03a95f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PROJECT_NAME=nostalgia VCPKG_VERSION=2020.06 -include deps/buildcore/base.mk +BUILDCORE_PATH=deps/buildcore +include ${BUILDCORE_PATH}/base.mk ifeq ($(OS),darwin) NOSTALGIA_STUDIO=./dist/${CURRENT_BUILD}/nostalgia-studio.app/Contents/MacOS/nostalgia-studio diff --git a/deps/buildcore/.gitignore b/deps/buildcore/.gitignore new file mode 100644 index 00000000..784af779 --- /dev/null +++ b/deps/buildcore/.gitignore @@ -0,0 +1,4 @@ +scripts/__pycache__ +CMakeLists.txt.user +Session.vim +graph_info.json diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk index 3fd66538..c733693d 100644 --- a/deps/buildcore/base.mk +++ b/deps/buildcore/base.mk @@ -8,12 +8,12 @@ else HOST_ENV=${OS}-$(shell uname -m) endif -SCRIPTS=scripts -SETUP_BUILD=python3 ./${SCRIPTS}/setup-build.py +SCRIPTS=${BUILDCORE_PATH}/scripts +SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py PYBB=python3 ${SCRIPTS}/pybb.py CMAKE_BUILD=${PYBB} cmake-build RM_RF=${PYBB} rm -SETUP_BUILD=python3 ./${SCRIPTS}/setup-build.py +SETUP_BUILD=python3 ${SCRIPTS}/setup-build.py PYBB=python3 ${SCRIPTS}/pybb.py CMAKE_BUILD=${PYBB} cmake-build RM_RF=${PYBB} rm diff --git a/scripts/pybb.py b/deps/buildcore/scripts/pybb.py similarity index 100% rename from scripts/pybb.py rename to deps/buildcore/scripts/pybb.py diff --git a/scripts/setup-build.py b/deps/buildcore/scripts/setup-build.py similarity index 100% rename from scripts/setup-build.py rename to deps/buildcore/scripts/setup-build.py