Merge pull request #473 from tsoding/426

[nothing.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cad5ae9eac92cb9dbeed3df40b2d52e8546168e..561f4bf6e8a61b956c513851d103deaf0d3a3ac2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,11 +16,10 @@ include_directories(src/)
 include_directories(${SDL2_INCLUDE_DIR})
 include_directories(${SDL2_MIXER_INCLUDE_DIR})
 
-set(SOURCE_FILES
+add_executable(nothing 
   src/color.c
   src/game.c
   src/game/camera.c
-  src/game/debug_tree.c
   src/ui/edit_field.c
   src/game/level.c
   src/game/level/background.c
@@ -43,12 +42,12 @@ 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
@@ -57,14 +56,11 @@ set(SOURCE_FILES
   src/ui/console.c
   src/ui/log.c
   src/str.c
-)
-
-set(HEADER_FILES
+  src/ui/history.c
+  src/game/level/regions.c
   src/color.h
   src/game.h
   src/game/camera.h
-  src/game/debug_node.h
-  src/game/debug_tree.h
   src/ui/edit_field.h
   src/game/level.h
   src/game/level/background.h
@@ -87,14 +83,14 @@ 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
@@ -103,23 +99,32 @@ set(HEADER_FILES
   src/ui/console.h
   src/ui/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/nth_alloc.h
+  src/system/nth_alloc.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
@@ -128,26 +133,26 @@ add_executable(repl
   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
   )
 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/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/error.c
   src/system/error.h
   src/system/lt.c