Skip to content
Snippets Groups Projects
Commit 10c3a0ba authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

unify build folders

parent 57bcc77d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build.sh
+ 6
− 6
View file @ 10c3a0ba
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
CACHE=/tmp/fggl/ CACHE=/tmp/fggl/
LOG=$CACHE/demo.log LOG=$CACHE/demo.log
EXE="../build/demo/FgglDemo" EXE="../builds/cli/demo/FgglDemo"
if [[ ! -d "build/" ]] if [[ ! -d "builds/cli/" ]]
then then
mkdir build mkdir -p builds/cli
fi fi
if [ ! -x "$(command -v cmake)" ]; then if [ ! -x "$(command -v cmake)" ]; then
...@@ -21,8 +21,8 @@ rm -rf $CACHE ...@@ -21,8 +21,8 @@ rm -rf $CACHE
# #
# build step # build step
# #
pushd build pushd builds/cli
cmake .. cmake ../..
make make
popd popd
...@@ -41,5 +41,5 @@ if [ -x "$(command -v mangohud)" ]; then ...@@ -41,5 +41,5 @@ if [ -x "$(command -v mangohud)" ]; then
fi fi
pushd demo pushd demo
$EXE ../build/demo/FgglDemo $EXE
popd popd
fggl/CMakeLists.txt
+ 1
− 1
View file @ 10c3a0ba
...@@ -2,7 +2,7 @@ configure_file(FgglConfig.h.in FgglConfig.h) ...@@ -2,7 +2,7 @@ configure_file(FgglConfig.h.in FgglConfig.h)
find_program(CLANG_TIDY_FOUND clang-tidy) find_program(CLANG_TIDY_FOUND clang-tidy)
if ( CLANG_TIDY_FOUND ) if ( CLANG_TIDY_FOUND )
set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=*,-llvmlibc-*,-fuchsia-*,-cppcoreguidelines-*,-llvm-*) set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=*,-llvmlibc-*,-fuchsia-*,-cppcoreguidelines-*,-android-*,-llvm-*,-altera-*)
endif() endif()
add_library(fggl fggl.cpp add_library(fggl fggl.cpp
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment