(#1180) return -> exit 1

[nothing.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16a6bc2236cd619d507b617ccb1e53b2fc565549..055274efe08d12f62e43801064dd3b6e24bcff30 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(WIN32)
   # then try to find SDL2 using normal means (eg. the user may have installed SDL2 using pacman on msys2)
   # note we don't use REQUIRED here, because it can fail -- in which case we fall back to looking for the 
   # library "directly" using local files.
-  find_package(SDL2)
+  find_package(SDL2 QUIET)
   if(NOT SDL2_FOUND)
     if(MINGW)
       # Support both 32 and 64 bit builds
@@ -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
@@ -106,6 +84,8 @@ add_executable(nothing
   src/game/level/action.h
   src/game/level_picker.h
   src/game/level_picker.c
+  src/game/credits.h
+  src/game/credits.c
   src/game/settings.h
   src/game/settings.c
   src/game/level_folder.c
@@ -171,8 +151,27 @@ add_executable(nothing
   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/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
 )
-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)