Merge pull request #1255 from tsoding/1253

[nothing.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e9a67ad68f4dd70e3caeb2865f4fc1439ecafa4..44b061269dd3823baa4f4fdfdd511f73a858fdb1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,28 +50,6 @@ include_directories(src/)
 
 include_directories(${SDL2_INCLUDE_DIRS})
 
-add_library(system STATIC
-  src/system/line_stream.h
-  src/system/line_stream.c
-  src/system/log.h
-  src/system/log.c
-  src/system/lt.h
-  src/system/lt_adapters.h
-  src/system/lt_adapters.c
-  src/system/nth_alloc.h
-  src/system/nth_alloc.c
-  src/system/stacktrace.h
-  src/system/stacktrace.c
-  src/system/str.h
-  src/system/str.c
-  src/dynarray.h
-  src/dynarray.c
-  src/hashset.h
-  src/hashset.c
-  src/system/file.h
-  src/system/file.c
-  )
-
 add_executable(nothing 
   src/color.h
   src/color.c
@@ -95,6 +73,8 @@ add_executable(nothing
   src/game/level/lava/wavy_rect.c
   src/game/level/platforms.h
   src/game/level/platforms.c
+  src/game/level/phantom_platforms.h
+  src/game/level/phantom_platforms.c
   src/game/level/player.h
   src/game/level/player.c
   src/game/level/explosion.h
@@ -110,8 +90,6 @@ add_executable(nothing
   src/game/credits.c
   src/game/settings.h
   src/game/settings.c
-  src/game/level_folder.c
-  src/game/level_folder.h
   src/game/sound_samples.h
   src/game/sound_samples.c
   src/game/sprite_font.h
@@ -141,16 +119,10 @@ add_executable(nothing
   src/ui/edit_field.c
   src/ui/history.h
   src/ui/history.c
-  src/ui/list_selector.h
-  src/ui/list_selector.c
   src/ui/wiggly_text.h
   src/ui/wiggly_text.c
   src/ui/slider.h
   src/ui/slider.c
-  src/ui/grid.h
-  src/ui/grid.c
-  src/game/level_metadata.h
-  src/game/level_metadata.c
   src/game/level/level_editor.h
   src/game/level/level_editor.c
   src/game/level/level_editor/color_picker.h
@@ -171,13 +143,31 @@ add_executable(nothing
   src/game/level/level_editor/background_layer.c
   src/game/level/level_editor/undo_history.h
   src/game/level/level_editor/undo_history.c
-  src/game/level/level_editor/action_picker.h
-  src/game/level/level_editor/action_picker.c
+  src/system/log.h
+  src/system/log.c
+  src/system/lt.h
+  src/system/lt_adapters.h
+  src/system/lt_adapters.c
+  src/system/nth_alloc.h
+  src/system/nth_alloc.c
+  src/system/stacktrace.h
+  src/system/stacktrace.c
+  src/system/str.h
+  src/system/str.c
+  src/dynarray.h
+  src/dynarray.c
+  src/system/file.h
+  src/system/file.c
+  src/ring_buffer.h
+  src/ring_buffer.c
 )
-target_link_libraries(nothing ${SDL2_LIBRARIES} system)
+target_link_libraries(nothing ${SDL2_LIBRARIES})
 
-ADD_CUSTOM_TARGET(link_assets ALL
-                  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/assets)
+if(WIN32)
+    ADD_CUSTOM_TARGET(link_assets ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/assets)
+else()
+    ADD_CUSTOM_TARGET(link_assets ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/assets ${CMAKE_BINARY_DIR}/assets)
+endif()
 
 if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang"))
   set(CMAKE_C_FLAGS