X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=CMakeLists.txt;h=9aeb187ace521dfe01e14da02654bb2208d46336;hb=ac89c8a2ec6d63688bd1437964eaab697e59c147;hp=7e90d257de93032916a9ae579febfc029f80ef8c;hpb=e78cc228648b823f054dfaeb098252cd229c4f0f;p=nothing.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e90d257..9aeb187a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,13 @@ find_package(SDL2 REQUIRED)
 find_package(SDL2_mixer REQUIRED)
 
 include_directories(src/)
-include_directories(${SDL2_INCLUDE_DIR})
+
+if(APPLE)
+  include_directories(${SDL2_INCLUDE_DIR}/..)
+else()
+  include_directories(${SDL2_INCLUDE_DIR})
+endif()
+
 include_directories(${SDL2_MIXER_INCLUDE_DIR})
 
 add_executable(nothing 
@@ -49,7 +55,6 @@ add_executable(nothing
   src/ebisp/gc.c
   src/ebisp/scope.c
   src/sdl/renderer.c
-  src/system/error.c
   src/system/lt.c
   src/system/lt/lt_adapters.c
   src/system/lt/lt_slot.c
@@ -92,7 +97,6 @@ add_executable(nothing
   src/ebisp/parser.h
   src/ebisp/tokenizer.h
   src/sdl/renderer.h
-  src/system/error.h
   src/system/lt.h
   src/system/lt/lt_adapters.h
   src/system/lt/lt_slot.h
@@ -107,8 +111,16 @@ add_executable(nothing
   src/game/level/script.c
   src/system/log.h
   src/system/log.c
+  src/system/log_script.h
+  src/system/log_script.c
   src/system/nth_alloc.h
   src/system/nth_alloc.c
+  src/game/level_script.c
+  src/game/level_script.h
+  src/ebisp/std.h
+  src/ebisp/std.c
+  src/system/stacktrace.h
+  src/system/stacktrace.c
 )
 
 add_executable(repl
@@ -131,8 +143,6 @@ add_executable(repl
   src/system/lt/lt_adapters.h
   src/system/lt/lt_slot.c
   src/system/lt/lt_slot.h
-  src/system/error.c
-  src/system/error.h
   src/ebisp/gc.h
   src/ebisp/gc.c
   src/str.h
@@ -141,6 +151,12 @@ add_executable(repl
   src/system/log.c
   src/system/nth_alloc.h
   src/system/nth_alloc.c
+  src/ebisp/repl_runtime.h
+  src/ebisp/repl_runtime.c
+  src/ebisp/std.h
+  src/ebisp/std.c
+  src/system/stacktrace.h
+  src/system/stacktrace.c
   )
 add_executable(nothing_test
   src/ebisp/builtins.c
@@ -157,8 +173,6 @@ add_executable(nothing_test
   src/ebisp/tokenizer.h
   src/ebisp/gc.h
   src/ebisp/gc.c
-  src/system/error.c
-  src/system/error.h
   src/system/lt.c
   src/system/lt.h
   src/system/lt/lt_adapters.c
@@ -174,10 +188,12 @@ add_executable(nothing_test
   src/system/log.c
   src/system/nth_alloc.h
   src/system/nth_alloc.c
+  src/system/stacktrace.h
+  src/system/stacktrace.c
   )
-target_link_libraries(nothing ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
-target_link_libraries(nothing_test ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
-target_link_libraries(repl ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
+target_link_libraries(nothing ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} m)
+target_link_libraries(nothing_test ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} m)
+target_link_libraries(repl ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} m)
 
 if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "CLANG"))
   set(CMAKE_C_FLAGS