(#640) Remove dynarray

[nothing.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12f6fa6cdd12128ed61afa58e9256bfc31c2174e..b291021f75716ff54f3e2e2b14e10cc36e0ce54a 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 
@@ -105,8 +111,20 @@ 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/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
 )
 
 add_executable(repl
@@ -137,6 +155,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
@@ -168,10 +192,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