drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox] Fix CMake inconsistency that broke PC builds

Browse Source
This commit is contained in:
Gary Talent 2019-06-19 23:32:59 -05:00
parent 5705fd3d00
commit ad85c59107
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/ox/CMakeLists.txt vendored
View File

@ -12,10 +12,10 @@ if(NOT DEFINED OX_RUN_TESTS)
set(OX_RUN_TESTS "ON") set(OX_RUN_TESTS "ON")
endif() endif()
if(NOT DEFINED OX_USE_STDLIB) if(NOT DEFINED OX_USE_STDLIB)
set(OX_USE_STDLIB "ON") set(OX_USE_STDLIB ON)
endif() endif()
if(NOT DEFINED OX_BARE_METAL) if(NOT DEFINED OX_BARE_METAL)
set(OX_BARE_METAL FALSE) set(OX_BARE_METAL OFF)
endif() endif()
set(OX_RUN_TESTS ${OX_RUN_TESTS} CACHE STRING "Run tests (ON/OFF)") set(OX_RUN_TESTS ${OX_RUN_TESTS} CACHE STRING "Run tests (ON/OFF)")
@ -24,7 +24,7 @@ set(OX_USE_STDLIB ${OX_USE_STDLIB} CACHE STRING "Build libraries that need the s
set(OX_BARE_METAL ${OX_BARE_METAL} CACHE STRING "Bare metal build (TRUE/FALSE)") set(OX_BARE_METAL ${OX_BARE_METAL} CACHE STRING "Bare metal build (TRUE/FALSE)")
# can't run tests without building them # can't run tests without building them
if(OX_BUILD_EXEC STREQUAL "OFF" OR OX_USE_STDLIB STREQUAL "OFF") if(OX_BUILD_EXEC STREQUAL "OFF" OR NOT ${OX_USE_STDLIB})
set(OX_BUILD_EXEC OFF) set(OX_BUILD_EXEC OFF)
set(OX_RUN_TESTS OFF) set(OX_RUN_TESTS OFF)
endif() endif()
@ -39,9 +39,7 @@ else()
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
endif() endif()
if(OX_USE_STDLIB STREQUAL "ON") if(NOT ${OX_USE_STDLIB})
add_definitions(-DOX_USE_STDLIB)
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
endif() endif()

4
deps/ox/src/ox/CMakeLists.txt vendored
View File

@ -1,6 +1,6 @@
if(OX_USE_STDLIB STREQUAL "ON") if(${OX_USE_STDLIB})
add_subdirectory(clargs) add_subdirectory(clargs)
endif(OX_USE_STDLIB STREQUAL "ON") endif()
add_subdirectory(fs) add_subdirectory(fs)
add_subdirectory(mc) add_subdirectory(mc)
add_subdirectory(ptrarith) add_subdirectory(ptrarith)