Fix GBA build not to build libraries that use stdlib

This commit is contained in:
2017-04-13 04:31:30 -05:00
parent c6e33e5285
commit 9183815634
4 changed files with 7 additions and 4 deletions
+3 -1
View File
@@ -7,9 +7,11 @@ include(address_sanitizer)
set(OX_BUILD_EXEC "ON" CACHE STRING "Build executables (ON/OFF)")
set(OX_RUN_TESTS "ON" CACHE STRING "Run tests (ON/OFF)")
set(OX_USE_STDLIB "ON" CACHE STRING "Build libraries that need the std lib (ON/OFF)")
# can't run tests without building them
if(OX_BUILD_EXEC STREQUAL "OFF")
if(OX_BUILD_EXEC STREQUAL "OFF" OR OX_USE_STDLIB STREQUAL "OFF")
set(OX_BUILD_EXEC "OFF")
set(OX_RUN_TESTS "OFF")
endif()
+1 -1
View File
@@ -10,7 +10,7 @@ BUILD_TYPE=$2
if [[ $TARGET == windows ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake"
elif [[ $TARGET == gba ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake -DOX_BUILD_EXEC=OFF"
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake -DOX_USE_STDLIB=OFF"
fi
if [[ $BUILD_TYPE == debug ]]; then
+3 -1
View File
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.8)
add_subdirectory(clargs)
if(OX_USE_STDLIB STREQUAL "ON")
add_subdirectory(clargs)
endif(OX_USE_STDLIB STREQUAL "ON")
add_subdirectory(fs)
add_subdirectory(std)
-1
View File
@@ -5,7 +5,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <stdio.h>
#include "filesystem.hpp"
namespace ox {