Add dist directory for gathering builds

This commit is contained in:
Gary Talent 2017-05-16 00:17:22 -05:00
parent 2c43777477
commit 6ca6ae82ba
4 changed files with 10 additions and 5 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ build/current
build/gba build/gba
build/*-release build/*-release
build/*-debug build/*-debug
dist
tags tags
nostalgia.gba nostalgia.gba
nostalgia.sav nostalgia.sav

View File

@ -53,7 +53,7 @@ shell:
release: release:
${ENV_RUN} rm -rf build/${HOST_ENV}-release ${ENV_RUN} rm -rf build/${HOST_ENV}-release
${ENV_RUN} ./scripts/setup_build ${HOST_ENV} ${ENV_RUN} ./scripts/setup_build ${HOST_ENV} release
${ENV_RUN} rm -f build/current ${ENV_RUN} rm -f build/current
${ENV_RUN} ln -s ${HOST_ENV}-release build/current ${ENV_RUN} ln -s ${HOST_ENV}-release build/current

View File

@ -15,15 +15,17 @@ fi
if [[ $BUILD_TYPE == debug ]]; then if [[ $BUILD_TYPE == debug ]]; then
buildTypeArgs="-DUSE_ASAN=ON -DCMAKE_BUILD_TYPE=Debug" buildTypeArgs="-DUSE_ASAN=ON -DCMAKE_BUILD_TYPE=Debug"
buildDir="build/${TARGET}-debug" elif [[ $BUILD_TYPE == release ]]; then
else
buildTypeArgs="-DCMAKE_BUILD_TYPE=Release" buildTypeArgs="-DCMAKE_BUILD_TYPE=Release"
buildDir="build/${TARGET}-release"
fi fi
buildDir="build/${TARGET}-${BUILD_TYPE}"
distDir="../../dist/${TARGET}-${BUILD_TYPE}"
mkdir -p $buildDir mkdir -p $buildDir
pushd $buildDir pushd $buildDir
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_PREFIX="$distDir" \
$buildTypeArgs \ $buildTypeArgs \
$toolchain \ $toolchain \
$project $project

View File

@ -11,6 +11,7 @@ add_library(
json_write.cpp json_write.cpp
wizard.cpp wizard.cpp
oxfstreeview.cpp oxfstreeview.cpp
plugin.cpp
project.cpp project.cpp
) )
@ -35,8 +36,9 @@ install(
json_err.hpp json_err.hpp
json_read.hpp json_read.hpp
json_write.hpp json_write.hpp
newwizard.hpp wizard.hpp
oxfstreeview.hpp oxfstreeview.hpp
plugin.hpp
project.hpp project.hpp
DESTINATION DESTINATION
include/nostalgia/studio/lib include/nostalgia/studio/lib