From 8b653fd7f66a1b2ce7c087c4c4602b5629b49610 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 12 Sep 2015 19:43:22 -0800 Subject: [PATCH] FreeBSD Fixes --- CMakeLists.txt | 10 ++++++++++ NODLib | 2 +- hecl | 2 +- libBoo | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fe3ab04d..415aac9f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,15 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -fno-exceptions") endif() +if(UNIX) +include_directories(/usr/local/include) +endif() + +#disable libBoo for FreeBSD for the time being +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") add_subdirectory(libBoo) set(BOO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libBoo/include) +endif() set(HECL_DATASPEC_DECLS "/* RetroCommon specs */ @@ -32,4 +39,7 @@ include_directories(${ATHENA_INCLUDE_DIR} ${LOG_VISOR_INCLUDE_DIR} ${HECL_INCLUD ${NODLIB_INCLUDE_DIR} ${MATHLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(DataSpec) +#disable Runtime on FreeBSD for now +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") add_subdirectory(Runtime) +endif() diff --git a/NODLib b/NODLib index 020e7d14c..24ba37606 160000 --- a/NODLib +++ b/NODLib @@ -1 +1 @@ -Subproject commit 020e7d14c99c34d107a82b9769ce67cbb07f49a3 +Subproject commit 24ba3760641bc32de1b650d0d0ca033386344788 diff --git a/hecl b/hecl index c2844bf9a..b2b3d9c34 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit c2844bf9a47a1b1da4fd6c2e0828f3179c095ecf +Subproject commit b2b3d9c34daa2e2c0e4b8cfd9c7d775f61d4bf56 diff --git a/libBoo b/libBoo index 101345c22..bb419b0bf 160000 --- a/libBoo +++ b/libBoo @@ -1 +1 @@ -Subproject commit 101345c2217c303ce3ae1423c723d329b03330ee +Subproject commit bb419b0bfd72c894cfc8eaf82fa1e4e32cf96af4