FreeBSD Fixes

Update HECL
2016-01-31 00:39:04 -08:00 · 2016-01-31 00:39:04 -08:00 · 60f9c80fcb
parent 39012da281
commit 60f9c80fcb
3 changed files with 5 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -87,11 +87,8 @@ include_directories(${ATHENA_INCLUDE_DIR} ${LOG_VISOR_INCLUDE_DIR} ${HECL_INCLUD
                    ${NODLIB_INCLUDE_DIR} ${MATHLIB_INCLUDE_DIR} ${BOO_INCLUDE_DIR}
                    ${SPECTER_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(DataSpec)
-#disable Runtime on FreeBSD for now
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 add_subdirectory(Editor)
 add_subdirectory(Runtime)
-endif()

 unset(GIT_EXECUTABLE CACHE)
 find_package(Git)
--- a/Editor/icons/packicons.c
+++ b/Editor/icons/packicons.c
@ -5,6 +5,10 @@
 #include <zlib.h>
 #include <png.h>

+#if __FreeBSD__
+#include <sys/wait.h>
+#endif
+
 #if _WIN32
 #define _bswap32(v) _byteswap_ulong(v)
 #define _bswap16(v) _byteswap_ushort(v)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 331a01afe46e155680f89ff6ca882954d40fee97
+Subproject commit 3a8130b8609cf91cd9f75a951f0eed16037d2618