(#434) Implement multiplication in Ebisp

[nothing.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5952cc218d62f4583f982407836f84536b33e166..9aeb187ace521dfe01e14da02654bb2208d46336 100644 (file)
--- 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,12 +55,11 @@ 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
   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
@@ -92,12 +97,11 @@ 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
   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
@@ -105,6 +109,18 @@ add_executable(nothing
   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(repl
@@ -127,12 +143,20 @@ 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
   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/ebisp/builtins.c
@@ -149,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
@@ -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