Fix GBA build not to build libraries that use stdlib
This commit is contained in:
+3
-1
@@ -7,9 +7,11 @@ include(address_sanitizer)
|
|||||||
|
|
||||||
set(OX_BUILD_EXEC "ON" CACHE STRING "Build executables (ON/OFF)")
|
set(OX_BUILD_EXEC "ON" CACHE STRING "Build executables (ON/OFF)")
|
||||||
set(OX_RUN_TESTS "ON" CACHE STRING "Run tests (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
|
# 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")
|
set(OX_RUN_TESTS "OFF")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ BUILD_TYPE=$2
|
|||||||
if [[ $TARGET == windows ]]; then
|
if [[ $TARGET == windows ]]; then
|
||||||
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake"
|
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake"
|
||||||
elif [[ $TARGET == gba ]]; then
|
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
|
fi
|
||||||
|
|
||||||
if [[ $BUILD_TYPE == debug ]]; then
|
if [[ $BUILD_TYPE == debug ]]; then
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
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(fs)
|
||||||
add_subdirectory(std)
|
add_subdirectory(std)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/.
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
#include <stdio.h>
|
|
||||||
#include "filesystem.hpp"
|
#include "filesystem.hpp"
|
||||||
|
|
||||||
namespace ox {
|
namespace ox {
|
||||||
|
|||||||
Reference in New Issue
Block a user