X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=CMakeLists.txt;h=bd2d43f224d915f35d6e50689f9d7440942808b2;hb=9a84ff98b3a8b7ab4493286e8c21c06b876b9a1d;hp=d9f75ca60c950c3e0cc8bc77597813db1f55f932;hpb=b4d072d809d70daabf4ba45dc66b3828ad6168dd;p=nothing.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f75ca6..bd2d43f2 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 
@@ -42,19 +48,18 @@ add_executable(nothing
   src/math/rand.c
   src/math/rect.c
   src/math/triangle.c
-  src/script/expr.c
-  src/script/interpreter.c
-  src/script/parser.c
-  src/script/tokenizer.c
-  src/script/gc.c
-  src/script/scope.c
+  src/ebisp/expr.c
+  src/ebisp/interpreter.c
+  src/ebisp/parser.c
+  src/ebisp/tokenizer.c
+  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
   src/ui/console.c
-  src/ui/log.c
+  src/ui/console_log.c
   src/str.c
   src/ui/history.c
   src/game/level/regions.c
@@ -83,72 +88,123 @@ add_executable(nothing
   src/math/rand.h
   src/math/rect.h
   src/math/triangle.h
-  src/script/builtins.c
-  src/script/builtins.h
-  src/script/expr.h
-  src/script/gc.h
-  src/script/scope.h
-  src/script/interpreter.h
-  src/script/parser.h
-  src/script/tokenizer.h
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.h
+  src/ebisp/gc.h
+  src/ebisp/scope.h
+  src/ebisp/interpreter.h
+  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
   src/ui/console.h
-  src/ui/log.h
+  src/ui/console_log.h
   src/str.h
   src/ui/history.h
   src/game/level/regions.h
   src/system/line_stream.h
   src/system/line_stream.c
+  src/game/level/script.h
+  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/ebisp/std.h
+  src/ebisp/std.c
+  src/system/stacktrace.h
+  src/system/stacktrace.c
+  src/game/level_picker.h
+  src/game/level_picker.c
+  src/broadcast.c
+  src/broadcast.h
+  src/game/level/rigid_bodies.h
+  src/game/level/rigid_bodies.c
+  src/math/extrema.h
+  src/math/extrema.c
 )
 
 add_executable(repl
-  src/script/builtins.c
-  src/script/builtins.h
-  src/script/expr.c
-  src/script/expr.h
-  src/script/interpreter.c
-  src/script/interpreter.h
-  src/script/parser.c
-  src/script/parser.h
-  src/script/scope.c
-  src/script/scope.h
-  src/script/tokenizer.c
-  src/script/tokenizer.h
-  src/script/repl.c
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.c
+  src/ebisp/expr.h
+  src/ebisp/interpreter.c
+  src/ebisp/interpreter.h
+  src/ebisp/parser.c
+  src/ebisp/parser.h
+  src/ebisp/scope.c
+  src/ebisp/scope.h
+  src/ebisp/tokenizer.c
+  src/ebisp/tokenizer.h
+  src/ebisp/repl.c
   src/system/lt.c
   src/system/lt.h
   src/system/lt/lt_adapters.c
   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/script/gc.h
-  src/script/gc.c
+  src/ebisp/gc.h
+  src/ebisp/gc.c
   src/str.h
   src/str.c
+  src/system/log.h
+  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(baker
+  src/ebisp/baker.c
+  src/ebisp/parser.c
+  src/ebisp/parser.h
+  src/ebisp/tokenizer.h
+  src/ebisp/tokenizer.c
+  src/ebisp/builtins.h
+  src/ebisp/builtins.c
+  src/ebisp/expr.c
+  src/ebisp/expr.h
+  src/ebisp/gc.c
+  src/ebisp/gc.h
+  src/system/lt.c
+  src/system/lt.h
+  src/system/lt/lt_slot.c
+  src/system/lt/lt_slot.h
+  src/system/stacktrace.h
+  src/system/stacktrace.c
+  src/system/nth_alloc.h
+  src/system/nth_alloc.c
+  src/system/log.h
+  src/system/log.c
+  src/str.h
+  src/str.c
+  )
+
 add_executable(nothing_test
-  src/script/builtins.c
-  src/script/builtins.h
-  src/script/expr.c
-  src/script/expr.h
-  src/script/interpreter.c
-  src/script/interpreter.h
-  src/script/parser.c
-  src/script/parser.h
-  src/script/scope.c
-  src/script/scope.h
-  src/script/tokenizer.c
-  src/script/tokenizer.h
-  src/script/gc.h
-  src/script/gc.c
-  src/system/error.c
-  src/system/error.h
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.c
+  src/ebisp/expr.h
+  src/ebisp/interpreter.c
+  src/ebisp/interpreter.h
+  src/ebisp/parser.c
+  src/ebisp/parser.h
+  src/ebisp/scope.c
+  src/ebisp/scope.h
+  src/ebisp/tokenizer.c
+  src/ebisp/tokenizer.h
+  src/ebisp/gc.h
+  src/ebisp/gc.c
   src/system/lt.c
   src/system/lt.h
   src/system/lt/lt_adapters.c
@@ -160,10 +216,16 @@ add_executable(nothing_test
   test/main.c
   test/test.h
   test/tokenizer_suite.h
+  src/system/log.h
+  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