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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80163e0f..9aeb187a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,16 @@ 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})
 
-set(SOURCE_FILES
+add_executable(nothing 
   src/color.c
   src/game.c
   src/game/camera.c
@@ -42,25 +48,21 @@ set(SOURCE_FILES
   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/region.c
-)
-
-set(HEADER_FILES
+  src/game/level/regions.c
   src/color.h
   src/game.h
   src/game/camera.h
@@ -86,71 +88,91 @@ set(HEADER_FILES
   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/region.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/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(nothing ${SOURCE_FILES} ${HEADER_FILES})
 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(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
@@ -162,10 +184,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